调整

src/views/modules/common/upload-component.vue

@@ -1,7 +1,7 @@
 <template>
     <section>
       <el-col :span="24">
-        <div v-show="displayTitle" class="title"><span style="color: red">*</span> {{title}}</div>
+        <div v-show="displayTitle" class="title"><span v-show="displayStar" style="color: red">*</span> {{title}}</div>
         <el-upload
           :disabled="display"
           class="upload-demo"
@@ -61,6 +61,10 @@
       displayTitle: {
         type: Boolean,
         default: true
+      },
+      displayStar: {
+        type: Boolean,
+        default: true
       }
     },
     watch: {

src/views/modules/notice/notice-add-or-update.vue

@@ -36,7 +36,7 @@
           </el-form-item>
         </el-row>
         <el-row class="my-row">
-          <upload-component :display="display" :title="'公告附件'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>
+          <upload-component :display-star="false" :display="display" :title="'公告附件'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>
         </el-row>
         <el-row style="margin-top: 15px">
           <el-form-item prop="receivers">
@@ -136,9 +136,6 @@
                   url: fList[i].url
                 })
               }
-            } else {
-              this.$message.error('请上传文件')
-              return
             }
             if (!this.dataForm.receivers || this.dataForm.receivers.length === 0) {
               this.$message.error('清选择接收对象')

src/views/modules/purchase/purchase-chose.vue

@@ -54,6 +54,40 @@
           :show-tooltip-when-overflow="true"
           label="型号及规格">
         </el-table-column>
+        <el-table-column
+          prop="price"
+          header-align="center"
+          align="center"
+          label="单价">
+        </el-table-column>
+        <el-table-column
+          prop="taxPrice"
+          header-align="center"
+          align="center"
+          label="含税单价">
+        </el-table-column>
+        <el-table-column
+          prop="amount"
+          header-align="center"
+          align="center"
+          min-width="100"
+          label="含税总价">
+          <template slot-scope="scope">
+            <span>{{ (scope.row.cnt*scope.row.taxPrice).toFixed(1) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="taxRate"
+          header-align="center"
+          align="center"
+          min-width="100"
+          label="税率">
+          <template slot-scope="scope">
+              <span>
+                {{scope.row.taxRate}} %
+              </span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="cnt"
           header-align="center"

src/views/modules/sale/contract-add-or-update.vue

@@ -141,6 +141,40 @@
                 :show-tooltip-when-overflow="true"
                 label="批次号/用途">
               </el-table-column>
+              <el-table-column
+                prop="price"
+                header-align="center"
+                align="center"
+                label="单价">
+              </el-table-column>
+              <el-table-column
+                prop="taxPrice"
+                header-align="center"
+                align="center"
+                label="含税单价">
+              </el-table-column>
+              <el-table-column
+                prop="amount"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="含税总价">
+                <template slot-scope="scope">
+                  <span>{{ (scope.row.cnt*scope.row.taxPrice).toFixed(1) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="taxRate"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="税率">
+                <template slot-scope="scope">
+              <span>
+                {{scope.row.taxRate}} %
+              </span>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="notes"
                 header-align="center"