Merge remote-tracking branch 'origin/demo_' into demo_

src/views/preparation/preparation/modules/BaseForm.vue

@@ -376,6 +376,16 @@ export default {
           return
         }
         // 日期处理
+        if (this.repairFileList.length === 0) {
+          this.$message.error('请上传相关图片')
+          this.confirmLoading = false
+          return
+        }
+        if (this.fileList.length === 0) {
+          this.$message.error('请上传相关文件')
+          this.confirmLoading = false
+          return
+        }
         values.imageList = this.repairFileList
         values.fileList = this.fileList // 维修文件
         values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)

src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -401,10 +401,10 @@ export default {
     computeTax (record, type) {
       if (type === 1) {
         console.log(record)
-        const data = (record.funitprice * record.num).toFixed(2)
+        const data = (record.funitprice * record.num * (1 + record.ipertaxrate / 100)).toFixed(2)
         record.fmoney = isNaN(data) ? 0 : data
       } else {
-        const data = (record.fmoney / record.num).toFixed(2)
+        const data = (record.fmoney / (record.num * (1 + record.ipertaxrate / 100))).toFixed(2)
         record.funitprice = isNaN(data) ? 0 : data
       }
       this.$forceUpdate()

src/views/store/outstoreform/modules/BaseFormYY2.vue

@@ -232,7 +232,7 @@
       </template>
       <template slot="addBom" slot-scope="text, record">
         <div>
-          <a-switch v-model="record.addBom" />
+          <a-switch :value="text" @change="changeBom(record)" />
         </div>
       </template>
       <template slot="remark" slot-scope="text, record">
@@ -685,6 +685,11 @@ export default {
         }
       }
     },
+    changeBom (record) {
+      console.log(record.addBom)
+      record.addBom = !record.addBom
+      this.$forceUpdate()
+    },
     onQuantityChange (e, autoId, attr) {
       const value = e.target.value
       console.log(value)