仓储修改

src/views/finance/contrast/index.vue

@@ -332,6 +332,8 @@
         <el-table-column label="数量" align="center" prop="fQty" />
         <el-table-column label="单价" align="center" prop="fUnitprice" />
         <el-table-column label="本次金额" align="center" prop="fAmt" />
+        <el-table-column label="业务类型" align="center" prop="fAmt" />
+
         <el-table-column label="业务类型" align="center" prop="fBilltype">
           <template slot-scope="scope">
             <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
@@ -1168,10 +1170,51 @@ export default {
             this.nothing.push(this.selection[item].fName)
             if(this.DzfeeList.length === 0) {
                 this.DzfeeList = this.DzfeeList.concat(this.selection)
+
+              //去重提单号
+              this.empty = new Set(this.empty)
+              this.empty = Array.from(this.empty)
+              //去重货权方
+              this.nothing = new Set(this.nothing)
+              this.nothing = Array.from(this.nothing)
+              if(this.empty.length <= 1){
+                this.pass.fMblno = this.empty[0]
+              }else {
+                this.pass.fMblno = this.empty[0] + "..."
+              }
+              if (this.nothing.length <= 1){
+                this.pass.fName = this.nothing[0]
+              }else {
+                this.pass.fName = this.nothing[0] + "..."
+              }
+              // this.DzfeeList = this.DzfeeList.concat(this.Fee)
+              this.queryParams.tMblno = this.pass.fMblno //提单号
+              this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
+              this.queryParams.fCtrlcorpid = this.pass.fName
+              this.queryParams.fAmtcr = this.pass.fAmtcr
+              this.queryParams.fAmtdr = this.pass.fAmtdr
+              this.innerVisible = false
+              this.feeList = []
+              //  this.feeList = this.DzfeeList
+              this.TWareHouseFees = {
+                fCorpid:'',
+                fToCorpid:'',
+                fMblno:'',
+                fStatementNo:'',
+                fFeeid :'',
+                timeExamine:'',
+                timeInterval:'',
+                fSrcdc:'',
+                fReconciliation:'0',
+                timeReconci: '',
+                fDc:'D'
+              }
+              return
             }else{
               for(let li in this.DzfeeList){
                 if(this.selection[item].fSrcid !== this.DzfeeList[li].fSrcid){
                   this.Fee = this.DzfeeList.concat(this.selection)
+                  console.log(this.Fee)
                   let result = [];
                   let obj = {};
                   for(let lis in this.Fee){
@@ -1180,51 +1223,53 @@ export default {
                       obj[this.Fee[lis].fSrcid] = true;
                     }
                   }
+                  //去重提单号
+                  this.empty = new Set(this.empty)
+                  this.empty = Array.from(this.empty)
+                  //去重货权方
+                  this.nothing = new Set(this.nothing)
+                  this.nothing = Array.from(this.nothing)
+                  if(this.empty.length <= 1){
+                    this.pass.fMblno = this.empty[0]
+                  }else {
+                    this.pass.fMblno = this.empty[0] + "..."
+                  }
+                  if (this.nothing.length <= 1){
+                    this.pass.fName = this.nothing[0]
+                  }else {
+                    this.pass.fName = this.nothing[0] + "..."
+                  }
+                  // this.DzfeeList = this.DzfeeList.concat(this.Fee)
+                  this.queryParams.tMblno = this.pass.fMblno //提单号
+                  this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
+                  this.queryParams.fCtrlcorpid = this.pass.fName
+                  this.queryParams.fAmtcr = this.pass.fAmtcr
+                  this.queryParams.fAmtdr = this.pass.fAmtdr
+                  this.innerVisible = false
+                  this.feeList = []
+                  //  this.feeList = this.DzfeeList
+                  this.TWareHouseFees = {
+                    fCorpid:'',
+                    fToCorpid:'',
+                    fMblno:'',
+                    fStatementNo:'',
+                    fFeeid :'',
+                    timeExamine:'',
+                    timeInterval:'',
+                    fSrcdc:'',
+                    fReconciliation:'0',
+                    timeReconci: '',
+                    fDc:'D'
+                  }
                   this.DzfeeList = result
                 }else{
-                  this.$message.error("从表已存在无法导入")
+                  let i = Number(item)+1
+                  this.$message.error('行号为'+ i +'重复')
+
                 }
               }
             }
           }
-          //去重提单号
-          this.empty = new Set(this.empty)
-          this.empty = Array.from(this.empty)
-          //去重货权方
-          this.nothing = new Set(this.nothing)
-          this.nothing = Array.from(this.nothing)
-          if(this.empty.length <= 1){
-            this.pass.fMblno = this.empty[0]
-          }else {
-            this.pass.fMblno = this.empty[0] + "..."
-          }
-          if (this.nothing.length <= 1){
-            this.pass.fName = this.nothing[0]
-          }else {
-            this.pass.fName = this.nothing[0] + "..."
-          }
-          // this.DzfeeList = this.DzfeeList.concat(this.Fee)
-          this.queryParams.tMblno = this.pass.fMblno //提单号
-          this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
-          this.queryParams.fCtrlcorpid = this.pass.fName
-          this.queryParams.fAmtcr = this.pass.fAmtcr
-          this.queryParams.fAmtdr = this.pass.fAmtdr
-          this.innerVisible = false
-          this.feeList = []
-          //  this.feeList = this.DzfeeList
-          this.TWareHouseFees = {
-            fCorpid:'',
-            fToCorpid:'',
-            fMblno:'',
-            fStatementNo:'',
-            fFeeid :'',
-            timeExamine:'',
-            timeInterval:'',
-            fSrcdc:'',
-            fReconciliation:'0',
-            timeReconci: '',
-            fDc:'D'
-          }
         }
       }else if(this.state_s == false){
         this.$message.error('本次金额不能大于原定金额');
@@ -1542,6 +1587,7 @@ export default {
             formData.append('tFee', JSON.stringify(this.queryParams))
             formData.append('tFeeDo', JSON.stringify(this.DzfeeList))
             updateFee(formData).then(response => {
+              console.log(response)
               this.queryParams = response.data.tFee
               this.msgSuccess('新增成功')
               // this.DzfeeList = []

src/views/warehouseBusiness/inStock/index.vue

@@ -640,16 +640,22 @@
 
           <el-col :span="8">
             <el-form-item label="劳务公司" prop="fLabour">
+<!--              <el-autocomplete-->
+<!--                v-model="form.fLabour"-->
+<!--                :fetch-suggestions="fMblnoOptions"-->
+<!--                placeholder="请输入内容"-->
+<!--                @select="flabourRemoteMethod"-->
+<!--              ></el-autocomplete>-->
               <el-select
                 style="width: 80%"
                 v-model="form.fLabour"
-                @keyup.enter.native="handleQuery"
                 :remote-method="flabourRemoteMethod"
                 filterable
+                remote
                 :disabled="contrOl"
                 placeholder="请输入劳务公司">
                 <el-option
-                  v-for="(dict, index) in fMblnoOptions"
+                  v-for="(dict, index) in fSbuOptions"
                   :key="index.fId"
                   :label="dict.fName"
                   :value="dict.fId"
@@ -669,13 +675,13 @@
                 style="width: 80%"
                 v-model="form.fFleet"
                 filterable
-                @keyup.enter.native="handleQuery"
+                remote
                 :remote-method="fleetRemoteMethod"
                 :disabled="contrOl"
                 placeholder="请输入车队">
 
                 <el-option
-                  v-for="(dict, index) in fMblnoOptions"
+                  v-for="(dict, index) in fSbuOptions"
                   :key="index.fId"
                   :label="dict.fName"
                   :value="dict.fId"
@@ -3016,6 +3022,9 @@ export default {
         nickName: null,
         deptId: null,
       },
+      fFleetVal:{
+        name:null
+      },
       closeButton:true,
       //表单校验
       checkout: {
@@ -3296,6 +3305,10 @@ export default {
     this.getDicts("data_stltype_type").then(response => {
       this.fStltypeidOptions = response.data;
     });
+    this.getDicts("data_customer_category").then(response => {
+      this.fSbuOptions = response.data;
+    });
+
   },
   activated() {
     this.adoPt()
@@ -3328,6 +3341,7 @@ export default {
       if (!row.fQty || row.fQty === "") {
         this.$set(row, "fNetweight", 0);
         this.$set(row, "fGrossweight", 0);
+        this.$set(row,'fQty',0)
         return false;
       }
 
@@ -4195,6 +4209,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
+      this.changefLourd()
       this.reset()
       this.form = {
           fItemsStatus: null,
@@ -4230,6 +4245,7 @@ export default {
       this.formBrowseStatus = false;
       const fId = row.fId || this.ids;
       this.dataList = [];
+
       this.goodsRemoteMethod()
       getWarehousebills(fId).then((response) => {
         console.log(response)

src/views/warehouseBusiness/outStock/index.vue

@@ -611,11 +611,13 @@
                 v-model="form.fLabour"
                 @keyup.enter.native="handleQuery"
                 :remote-method="flabourRemoteMethod"
+                remote
+                filterable
                 :disabled="contrOl"
                 placeholder="请输入劳务公司"
               >
                 <el-option
-                  v-for="(dict, index) in fMblnoOptions"
+                  v-for="(dict, index) in fSbuOptions"
                   :key="index.fId"
                   :label="dict.fName"
                   :value="dict.fId"
@@ -636,11 +638,13 @@
                 v-model="form.fFleet"
                 @keyup.enter.native="handleQuery"
                 :remote-method="fleetRemoteMethod"
+                filterable
+                remote
                 :disabled="contrOl"
                 placeholder="请输入车队"
               >
                 <el-option
-                  v-for="(dict, index) in fMblnoOptions"
+                  v-for="(dict, index) in fSbuOptions"
                   :key="index.fId"
                   :label="dict.fName"
                   :value="dict.fId"

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -430,7 +430,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="仓库" prop="fWarehouseid">
+            <el-form-item label="调入仓库" prop="fWarehouseid">
               <el-select
                 v-model="form.fWarehouseid"
                 filterable
@@ -450,6 +450,27 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="调出仓库" prop="fInwarehouseid">
+              <el-select
+                v-model="form.fInwarehouseid"
+                filterable
+                remote
+                :disabled="browseStatus || formBrowseStatus"
+                style="width: 80%"
+                @keyup.enter.native="handleQuery"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="(dict, index) in warehouseOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -908,7 +929,7 @@
             </el-table-column>
 
             <el-table-column
-              prop="fWarehouseids"
+              prop="fOrgWarehouseInformation"
               header-align="center"
               align="center"
               label="库位"
@@ -2551,6 +2572,7 @@ export default {
         fMblno: null,
         fCorpid: null,
         fWarehouseid: null,
+        fInwarehouseid:null
       },
       // 表单参数
       form: {
@@ -3118,7 +3140,7 @@ export default {
           fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
           fBillingway: this.dialogWhgenlegList[whgen].fBillingway,
           fChargedate: this.dialogWhgenlegList[whgen].fChargedate,
-          fWarehouseids: this.dialogWhgenlegList[whgen].fWarehouseids,
+          fOrgWarehouseInformation: this.dialogWhgenlegList[whgen].fWarehouseids,
           fPackagespecs: this.dialogWhgenlegList[whgen].fPackagespecs,
           fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
           fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
@@ -3278,7 +3300,9 @@ export default {
       this.whgenlegParams.fMblno = this.form.fMblno;
       this.whgenlegParams.fCorpid = this.form.fCorpid;
       this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
+      this.whgenlegParams.fInwarehouseid = this.form.fInwarehouseid
       listWhgenleg(this.whgenlegParams).then((response) => {
+        console.log(response)
         this.whgenlegList = response.rows;
         this.whgenlegTotal = response.total;
       });
@@ -4101,6 +4125,7 @@ export default {
           setTimeout(() => {
             this.form.fBillstatus = 2
             let formData = new window.FormData()
+            console.log(this.form)
             formData.append("warehouseBills", JSON.stringify(this.form));
             formData.append("warehousebillsitems", JSON.stringify(this.dataList));
             formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));