1.调整调拨作业单、叫车进场开关

2.给账单明细添加业务编号数据

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -798,12 +798,14 @@
               <el-button
                 size="small"
                 type="info"
+                v-if="entryPrinting == 0"
                 prop="打印"
                 @click="printZyd"
                 >作业单
               </el-button>
               <el-button
                 size="small"
+                v-if="entryPrinting == 0"
                 :disabled="browseStatus"
                 @click="discharge"
                 >叫车进场</el-button
@@ -4238,6 +4240,7 @@ export default {
       isShowInvoice: null,
       // 是否启用费用确认单
       isShowFeesConfirm: null,
+      entryPrinting: 1,
       // 选择打印抬头中文名
       fCompanyName: '',
       printFeeConfirm: {
@@ -4284,6 +4287,9 @@ export default {
       this.fStorageTypeOptions = response.data;
       localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
     });
+    this.getConfigKey('entry.printing').then((response) => {
+      this.entryPrinting = response.msg
+    })
     this.getConfigKey("data_showcar").then((response) => {
       this.dataShowcar = response.msg;
       if (this.dataShowcar == "0") {
@@ -4908,9 +4914,12 @@ export default {
         if (!this.Printinglist[item].fId) {
           return this.$message.error("请存在未保存的数据");
         }
-        if (this.Printinglist[item].fBillstatus == 10) {
-          return this.$message.error("请存在未打印的作业单");
+        if (this.entryPrinting == 0) {
+          if (this.Printinglist[item].fBillstatus == 10) {
+            return this.$message.error("请存在未打印的作业单");
+          }
         }
+
         // if (!this.Printinglist[item].fTruckno) {
         //   return this.$message.error("车号不能为空");
         // }
@@ -5737,13 +5746,45 @@ export default {
     },
     // 库存明细多选
     Selectinventory(selection) {
-      this.Printinglist = selection;
+      this.Printinglist = selection
+      //允许撤销入库list
+      this.dataWithdrawList = selection
+      //允许确认入库list
+      this.dataListSelection = selection
+      if (this.dataWithdrawList.length === 0) {
+        this.cancelDelivery = true
+      } else {
+        for (let item in this.dataWithdrawList) {
+          if (this.dataWithdrawList[item].fBillstatus === 40) {
+            this.cancelDelivery = false
+            this.deliveryConfirmation = true
+            for (let li in this.dataWithdrawList) {
+              if (this.entryPrinting != 0 ? this.dataWithdrawList[li].fBillstatus === 10 : this.dataWithdrawList[li].fBillstatus === 30) {
+                this.deliveryConfirmation = true
+                this.cancelDelivery = true
+                return
+              }
+            }
+          } else if (this.entryPrinting != 0 ? this.dataWithdrawList[item].fBillstatus === 10 : this.dataWithdrawList[item].fBillstatus === 30) {
+            this.deliveryConfirmation = false
+            this.cancelDelivery = true
+            for (let li in this.dataWithdrawList) {
+              if (this.dataWithdrawList[li].fBillstatus === 40) {
+                this.deliveryConfirmation = true
+                this.cancelDelivery = true
+                return
+              }
+            }
+          }
+        }
+      }
+      /* this.Printinglist = selection;
       //允许确认入库list
       this.dataListSelection = [];
       this.dataListSelection = selection.filter((e) => e.fBillstatus == 30);
       //允许撤销入库list
       this.dataWithdrawList = [];
-      this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40);
+      this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40); */
     },
     // 合计
     getSummaries(param) {

src/views/finance/query/index.vue

@@ -183,6 +183,15 @@
               </el-form-item>
             </el-col>
             <el-col :xs="12" :sm="6">
+              <el-form-item label="业务编号" prop="fSrcBillno">
+                <el-input
+                  v-model="queryParams.fSrcBillno"
+                  placeholder="请输入业务编号"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="12" :sm="6">
               <el-form-item label="对账状态">
                 <el-select
                   v-model="queryParams.feesStatus"
@@ -447,145 +456,152 @@ export default {
           name: "提单号",
           checked: 0,
           width: 180,
-        }, {
+        },
+        {
           surface: "3",
+          label: "fSrcBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 180,
+        },{
+          surface: "4",
           label: "fBsdate",
           name: "业务日期",
           checked: 0,
           width: 100,
         },{
-          surface: "4",
+          surface: "5",
           label: "fReviewDate",
           name: "审核日期",
           checked: 0,
           width: 100,
         },{
-          surface: "5",
+          surface: "6",
           label: "feeName",
           name: "费用名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "fBillstatusName",
           name: "费用状态",
           checked: 0,
           width: 100,
         },{
-          surface: "6",
+          surface: "8",
           label: "fDc",
           name: "收/付",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
+          surface: "9",
           label: "fAmount",
           name: "金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "8",
+          surface: "10",
           label: "fStlamount",
           name: "结算金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "9",
+          surface: "11",
           label: "fStlamountDate",
           name: "结算日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "10",
+          surface: "12",
           label: "fInvamount",
           name: "开票金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "11",
+          surface: "13",
           label: "fInvnos",
           name: "发票号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "12",
+          surface: "14",
           label: "fAccamount",
           name: "对账金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "13",
+          surface: "15",
           label: "fAccamountDate",
           name: "对账日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "16",
           label: "fStatementNo",
           name: "对账单号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "17",
           label: "fFeeunitid",
           name: "计价单位",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "18",
           label: "fQty",
           name: "数量",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "19",
           label: "fUnitprice",
           name: "单价",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "20",
           label: "fBilltype",
           name: "业务类型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "21",
           label: "fStltypeid",
           name: "结算方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "22",
           label: "fProductName",
           name: "货物名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "23",
           label: "fShipper",
           name: "发货方(货主)",
           checked: 0,
           width: 130,
         },
         {
-          surface: "20",
+          surface: "24",
           label: "remark",
           name: "备注",
           checked: 0,