Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/finance/contrast/index.vue

@@ -1123,7 +1123,7 @@ export default {
         fReconciliation:'0',
         timeReconci: '',
         fDc:'D',
-        fBilltype:'SJRK'
+        fBilltype:''
       }
       if(this.queryParams.fCorpid){
         this.doNot = true

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2828,10 +2828,10 @@
             this.$message.error('新货权方不得与货权方一致')
             return false
           }
-          if (this.dataList.length === 0) {
-            this.$message.error('请添加库存明细!')
-            return false
-          }
+          // if (this.dataList.length === 0) {
+          //   this.$message.error('请添加库存明细!')
+          //   return false
+          // }
           this.updateDeduplication()
           for (let list in this.dataList) {
             if (!this.dataList[list].fQty || Number(this.dataList[list].fQty) === 0) {

src/views/warehouseBusiness/outStock/index.vue

@@ -2744,6 +2744,7 @@ export default {
   },
   data() {
     return {
+      key_s:'',
       // 劳务公司
       fCompanyOptIons: [],
       Navigation:false,
@@ -3333,6 +3334,7 @@ export default {
           fTaskType:Number(fTaskType),
           fLabour:this.form.fLabour
         }
+        this.key_s = kye
       }else if (kye == 1) {
         console.log("11111")
         this.Navigation = true
@@ -3342,6 +3344,7 @@ export default {
           fTaskType:Number(fTaskType),
           fFleet:this.form.fFleet
         }
+        this.key_s = kye
       }else {
         console.log("3333")
         this.Navigation = false
@@ -3350,6 +3353,7 @@ export default {
           pageSize:10,
           fCorpid:this.form.fCorpid
         }
+        this.key_s = kye
       }
       operationAgreement(data).then((response) => {
         console.log(response)
@@ -3433,41 +3437,75 @@ export default {
         }
         // qty=(qty/1000).toFixed(2);
         let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
-        if (this.costStatus === 'Cr') {
-          this.warehouseCrList.push({
-            fQty: qty,
-            fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
-            fFeeid: feeId,
-            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
-            fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
-            fCurrency: 'RMB',
-            fExrate: 1,
-            fAmount: fAmount,
-            fTaxrate: this.fTaxrate,
-            fMblno:this.form.fMblno,
-            fProductName:this.form.fProductName,
-            fMarks:this.form.fMarks,
-            fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
-          })
-          console.log(this.fQty)
-        } else {
+        console.log(this.costStatus)
+        if(this.costStatus == '3' ){
+          console.log("jinzhe")
           this.warehouseDrList.push({
-            fQty: qty,
-            fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
-            fFeeid: feeId,
-            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
-            fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
-            fCurrency: 'RMB',
-            fExrate: 1,
-            fAmount: fAmount,
-            fTaxrate: this.fTaxrate,
-            fMblno:this.form.fMblno,
-            fProductName:this.form.fProductName,
-            fMarks:this.form.fMarks,
-            fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
-
-          })
+                fQty: qty,
+                fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+                fFeeid: feeId,
+                fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+                fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
+                fCurrency: 'RMB',
+                fExrate: 1,
+                fAmount: fAmount,
+                fTaxrate: this.fTaxrate,
+                fMblno:this.form.fMblno,
+                fProductName:this.form.fProductName,
+                fMarks:this.form.fMarks,
+                fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
+              })
+        }else{
+          this.warehouseCrList.push({
+                fQty: qty,
+                fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+                fFeeid: feeId,
+                fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+                fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
+                fCurrency: 'RMB',
+                fExrate: 1,
+                fAmount: fAmount,
+                fTaxrate: this.fTaxrate,
+                fMblno:this.form.fMblno,
+                fProductName:this.form.fProductName,
+                fMarks:this.form.fMarks,
+                fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
+              })
         }
+        // if (this.costStatus === 'Cr' ) {
+        //   this.warehouseCrList.push({
+        //     fQty: qty,
+        //     fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+        //     fFeeid: feeId,
+        //     fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+        //     fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
+        //     fCurrency: 'RMB',
+        //     fExrate: 1,
+        //     fAmount: fAmount,
+        //     fTaxrate: this.fTaxrate,
+        //     fMblno:this.form.fMblno,
+        //     fProductName:this.form.fProductName,
+        //     fMarks:this.form.fMarks,
+        //     fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
+        //   })
+        //   console.log(this.fQty)
+        // } else {
+        //   this.warehouseDrList.push({
+        //     fQty: qty,
+        //     fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+        //     fFeeid: feeId,
+        //     fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+        //     fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
+        //     fCurrency: 'RMB',
+        //     fExrate: 1,
+        //     fAmount: fAmount,
+        //     fTaxrate: this.fTaxrate,
+        //     fMblno:this.form.fMblno,
+        //     fProductName:this.form.fProductName,
+        //     fMarks:this.form.fMarks,
+        //     fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
+        //   })
+        // }
       }
       this.warehousingagreements = false
     },

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -4215,10 +4215,10 @@ export default {
     saveForm () {
       this.updateDeduplication()
       this.$refs['form'].validate((valid) => {
-        if (this.dataList.length === 0) {
-          this.$message.error('请添加库存明细!')
-          return false
-        }
+        // if (this.dataList.length === 0) {
+        //   this.$message.error('请添加库存明细!')
+        //   return false
+        // }
         for (let list in this.dataList) {
           this.changeStock(this.dataList[list])
         }