仓储模块修改

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -132,13 +132,23 @@
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fWarehouseid">
-        <treeselect style="width:160px"
-                    v-model="queryParams.fWarehouselocid"
-                    :options="fWarehouseidOption"
-                    @select="treeseLect"
-                    :show-count="true"
-                    :disable-branch-nodes="true"
-                    placeholder="请选择归属库区" />
+        <el-select
+          v-model="queryParams.fWarehouseid"
+          filterable
+          remote
+          @select="treeseLect"
+          :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-form-item label="品牌" prop="fMarks">
         <el-input
@@ -684,7 +694,7 @@
         >
         </el-table-column>
         <el-table-column
-          prop="fWarehouseids"
+          prop="fWarehouseInformation"
           header-align="center"
           width="150px"
           align="center"
@@ -1966,6 +1976,7 @@
         this.fWarehouseidOption = response.data
       })
       this.register()
+      this.warehousesssMethod()
     },
     activated(){
       this.Jump()
@@ -2219,7 +2230,7 @@
               fVolumn: this.dialogWhgenlegList[whgen].fVolumnblc,
               fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
               fBillingway: this.dialogWhgenlegList[whgen].fBillingway,
-              fWarehouseids: this.dialogWhgenlegList[whgen].fWarehouseids,
+              fWarehouseInformation: this.dialogWhgenlegList[whgen].fWarehouseids,
               fPackagespecs: this.dialogWhgenlegList[whgen].fPackagespecs,
               fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
               fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
@@ -2443,6 +2454,18 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams = {
+          fBillno:null,
+          createBy:null,
+          timeInterval:null,
+          fTrademodeid:null,
+          fCorpid:null,
+          fMblno:null,
+          fSbu:null,
+          fGoodsid:null,
+          fWarehouseid:null,
+          fMarks:null,
+        }
         this.resetForm('queryForm')
         this.handleQuery()
       },
@@ -2863,7 +2886,6 @@
             formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
             addGoodsTransfer(formData).then((response) => {
-              console.log(response)
               this.msgSuccess('保存成功')
               this.form = response.data.warehouseBills
               this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))

src/views/warehouseBusiness/inStock/index.vue

@@ -2811,7 +2811,7 @@
           id="print_area1"
           class="biaoge zzss"
           border="1"
-          style="border-collapse: collapse; border: none"
+          style="border-collapse: collapse;border: none"
         >
           <tr>
             <td
@@ -2828,13 +2828,13 @@
               width="900"
               colspan="4"
               class="zzss"
-              style="font-size: 28px; font-weight: bold"
+              style="font-size: 28px; font-weight: bold;"
             >
             </td>
             <td
               width="500"
               colspan="2"
-              style="padding-bottom: 0px; font-weight: bold; border: none"
+              style="padding-bottom: 0px; font-weight: bold;"
               class="zzss"
             >
               入库日期：{{ fBsdates }}
@@ -2898,9 +2898,9 @@
             <td>机械/人工：</td>
             <td></td>
           </tr>
-          <tr>
-            <td colspan="6" class="zzss">&nbsp;</td>
-          </tr>
+<!--          <tr>-->
+<!--            <td colspan="6" class="zzss">&nbsp;</td>-->
+<!--          </tr>-->
           <tr>
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
@@ -3548,7 +3548,7 @@ export default {
     printSomething() {
       // 此处的style即为打印时的样式
       const style =
-        "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
+        "@media print { .print-div{ border:none;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
       print({
         printable: "print_area3",
         type: "html",
@@ -3559,7 +3559,7 @@ export default {
     printSomething1() {
       // 此处的style即为打印时的样式
       const style =
-        "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
+        "@media print { .print-div{ border:none;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
       print({
         printable: "print_area2",
         type: "html",
@@ -3570,7 +3570,7 @@ export default {
     printSomething2() {
       // 此处的style即为打印时的样式
       const style =
-        "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
+        "@media print { .print-div{ border:none;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center;border:1px solid #000}}";
       print({
         printable: "print_area1",
         type: "html",
@@ -3723,6 +3723,8 @@ export default {
       }
     },
     showEditDialog_sss() {
+      treeselect(this.form.fWarehouseid).then(response => {
+      })
       if (this.Printinglist.length > 0) {
         if(this.form.fFeetunit > 3){
           this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
@@ -4070,7 +4072,6 @@ export default {
           });
           let qty = 1;
           if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 1) {
-            console.log("111")
             qty = this.fQty
           } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 2) {
             qty = (this.fGrossweight/1000).toFixed(2)
@@ -4098,7 +4099,6 @@ export default {
               fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
             })
           }else{
-            console.log(this.dialogWhgenlegList[zhgen].fFeeUnitid)
             this.warehouseCrList.push({
               fQty: qty,
               fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
@@ -4114,9 +4114,7 @@ export default {
               fMarks:this.form.fMarks,
               fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
             })
-            console.log(this.warehouseCrList)
           }
-
         }
         this.warehousingagreements = false;
       }
@@ -4250,6 +4248,18 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        fBillno:null,
+        createBy:null,
+        timeInterval:null,
+        fTrademodeid:null,
+        fCorpid:null,
+        fMblno:null,
+        fSbu:null,
+        fGoodsid:null,
+        fWarehouseid:null,
+        fMarks:null,
+      }
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -4403,7 +4413,6 @@ export default {
           this.$set(this.warehouseDrList[dr], "fQty", this.warehouseDrList[dr].fQty.toFixed(2));
           this.$set(this.warehouseDrList[dr], "fAmount", this.warehouseDrList[dr].fAmount.toFixed(2));
         }
-        console.log(JSON.stringify(this.warehouseDrList))
         this.warehouseCrList = response.data.warehousebillsfeesCr;
         for (let cr in this.warehouseCrList) {
           this.$set(this.warehouseCrList[cr], "fFeeUnitid", this.warehouseCrList[cr].fFeeunitid + "");
@@ -4691,7 +4700,6 @@ export default {
           for (let se in this.dataListSelection) {
             if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
               dataList.push(this.dataListSelection[se])
-              console.log("111")
             }
           }
           if (dataList.length !== 0) {
@@ -4849,7 +4857,6 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           if(!this.dataList.length){
-            console.log("000")
             this.form.fBillstatus = status
             this.form.fNetweight = this.fNetweight
             this.form.fPlanvolumn = this.fPlanvolumn
@@ -4882,7 +4889,6 @@ export default {
             formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
             addWarehousebills(formDatae).then((response) => {
               this.msgSuccess('保存成功')
-              console.log("000")
               this.form = response.data.warehouseBills
               this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
               this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
@@ -4939,7 +4945,6 @@ export default {
             // 收款
             formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
             addWarehousebills(formDatae).then((response) => {
-              console.log("111")
               this.msgSuccess('保存成功')
               this.form = response.data.warehouseBills
               this.$set(this.form, 'fEta', Date.parse(this.form.fEta))

src/views/warehouseBusiness/outStock/index.vue

@@ -3413,7 +3413,7 @@ export default {
     },
     printSomething() {
       // 此处的style即为打印时的样式
-      const style = "@media print { .print-div{ padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
+      const style = "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
       print({ printable: "print_area", type: "html",
         style: style, // 亦可使用引入的外部css;
         scanStyles: false,
@@ -3911,13 +3911,10 @@ export default {
     },
     // 收款信息
     addCollection() {
-      console.log(this.form.fBusinessType)
       if(this.form.fBusinessType == null){
-        console.log("111")
         this.$message.error("请维护作业类型")
         return false
       }else {
-        console.log("222")
         this.warehouseDrList.push({
           fcorpid: this.form.fCorpid,
           ffeeid: null,
@@ -4124,6 +4121,18 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        fBillno:null,
+        createBy:null,
+        timeInterval:null,
+        fTrademodeid:null,
+        fCorpid:null,
+        fMblno:null,
+        fSbu:null,
+        fGoodsid:null,
+        fWarehouseid:null,
+        fMarks:null,
+      }
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -242,17 +242,17 @@
         label="调拨日期"
         align="center"
         prop="createTime"
-        style="width: 60%"
+        width="100"
         ><template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="调入仓库" align="center" prop="fWarehouseid" />
       <el-table-column label="调出仓库" align="center" prop="fInwarehouseid" />
-      <el-table-column label="实际调拨件数" align="center" prop="fQty" />
-      <el-table-column label="计划调拨件数" align="center" prop="fPlanqty" />
-      <el-table-column label="计划调拨毛重(kg)" align="center" prop="fPlangrossweight" />
-      <el-table-column label="计划调拨净重(kg)" align="center" prop="fPlannetweight" />
+      <el-table-column label="计划调拨件数" align="center" prop="fPlanqty" width="100"/>
+      <el-table-column label="调拨件数" align="center" prop="fQty" />
+      <el-table-column label="调拨毛重(kg)" align="center" prop="fGrossweight" width="100"/>
+      <el-table-column label="调拨净重(kg)" align="center" prop="fNetweight" width="100"/>
       <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>
 
       <el-table-column
@@ -942,7 +942,7 @@
               header-align="center"
               width="240px"
               align="center"
-              label="*调入1库位"
+              label="*调入库位"
             >
               <template slot-scope="scope">
                 <el-input
@@ -2635,6 +2635,7 @@ export default {
         fPlannetweight: [{ required: true, message: " ", trigger: "blur"},],
         fPlangrossweight: [{ required: true, message: " ", trigger: "blur"},],
         fBusinessType: [{ required: true, message: " ", trigger: "blur"},],
+        fInwarehouseid: [{ required: true, message: " ", trigger: "blur"},],
         fbillingway: [
           {
             required: true,
@@ -3533,6 +3534,18 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        fBillno:null,
+        createBy:null,
+        timeInterval:null,
+        fTrademodeid:null,
+        fCorpid:null,
+        fMblno:null,
+        fSbu:null,
+        fGoodsid:null,
+        fWarehouseid:null,
+        fMarks:null,
+      }
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -4062,7 +4075,6 @@ export default {
           for (let se in this.dataListSelection) {
             if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
               dataList.push(this.dataListSelection[se])
-              console.log("111")
             }
           }
           if (dataList.length !== 0) {
@@ -4176,7 +4188,6 @@ export default {
           this.formBrowseStatus = true
           this.$refs.tableList.clearSelection()
           disChargelist(formData).then((response) => {
-            console.log(response)
             for (let li in withdrawList) {
               for (let i in this.dataList) {
                 if (withdrawList[li].fId === this.dataList[i].fId) {
@@ -4212,9 +4223,7 @@ export default {
     // 库存明细多选
     selectinventory(selection) {
       for(let item in selection){
-        console.log(selection[item].fBillstatus)
         if(selection[item].fBillstatus > '20'){
-          console.log("111")
           this.browseStatu = true
         }else{
           this.browseStatu = false