修改

src/api/warehouseBusiness/stockTransfer.js

@@ -116,7 +116,7 @@ export function RevocationApproval(data){
 }
 
 // 撤销请核
-export function backFee(fId) {
+export function revoke(fId) {
   return request({
     url: '/warehouseBusiness/stockTransfer/withdrawById/' + fId,
     method: 'get',
@@ -136,3 +136,26 @@ export function delstockTransfer_s(fId) {
     method: 'delete'
   })
 }
+// 接单撤销(请核)
+export function ordersRevoke(fId) {
+  return request({
+    url: '/warehouseBusiness/stockTransfer/withdrawOrdersById/' + fId,
+    method: 'get',
+  })
+}
+//主表审核
+export function submitWarehousingApproval(data) {
+  return request({
+    url: '/warehouseBusiness/stockTransfer/submitWarehousingApproval',
+    method: 'post',
+    data: data
+  })
+}
+//删除前的判断2
+export function checkCode(query) {
+  return request({
+    url: '/warehouseBusiness/inStock/checkCode',
+    method: 'get',
+    params: query
+  })
+}

src/main.js

@@ -236,4 +236,15 @@ Vue.directive('Alphabet', {
         input.value = input.value.replace(/[^A-Za-z0-9]/g,'')
       }
     }
+});
+Vue.directive('Space', {
+  inserted: function (el) {
+      const input = el.querySelector('.el-input__inner');
+      input.onkeyup = function (e) {
+        input.value = input.value.replace(/\s+/g,'')
+      }
+      input.onblur = function (e) {
+        input.value = input.value.replace(/\s+/g,'')
+      }
+    }
 });

src/views/Warehousing/components/payMoney.vue

@@ -636,7 +636,7 @@ export default {
       data = {
         pageNum: 1,
         pageSize: 10,
-        fTaskType: key,
+        fTaskType: 1,
         fFleet: this.form.fFleet,
       };
       operationAgreement(data).then((response) => {

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -85,49 +85,28 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            v-if="dataShowcar == '1'"
-            label="结算方式"
-            prop="fStltypeid"
-          >
-            <el-select
-              v-model="form.fStltypeid"
-              placeholder="请选择结算方式"
-              clearable
-              :disabled="browseStatus || form.warehouseStatus > 3"
-              style="width: 80%"
-            >
-              <el-option
-                v-for="(item, index) in fStltypeOptions"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item
-            v-if="dataShowcar == '0'"
-            label="计费单位"
-            prop="fFeetUnit"
-          >
-            <el-select
-              v-model="form.fFeetUnit"
-              placeholder="请选择计费单位"
-              clearable
-              :disabled="browseStatus || form.warehouseStatus > 3"
-              style="width: 80%"
-            >
-              <el-option
-                v-for="(item, index) in fFeetUnitOptions"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <el-form-item label="作业类型" prop="fBusinessType">
+              <el-select
+                style="width: 80%"
+                v-model="form.fBusinessType"
+                filterable
+                @change="educationChange"
+                :disabled="
+                  browseStatus ||
+                  warehouseDrList.length > 0 ||
+                  warehouseCrList.length > 0 ||
+                  form.warehouseStatus > 3
+                "
+              >
+                <el-option
+                  v-for="(item, index) in businessTypeOption"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         <el-col :span="8">
           <el-form-item label="提单号" prop="fMblno">
             <el-input
@@ -139,6 +118,7 @@
               "
               style="width: 80%"
               placeholder="请输入提单号"
+              v-Space
             />
           </el-form-item>
         </el-col>
@@ -343,25 +323,20 @@
       <div v-if="detailsHidden2">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="作业类型" prop="fBusinessType">
+            <el-form-item label="计费单位" prop="fFeetUnit">
               <el-select
+                v-model="form.fFeetUnit"
+                placeholder="请选择计费单位"
+                clearable
+                :disabled="browseStatus || form.warehouseStatus > 3"
                 style="width: 80%"
-                v-model="form.fBusinessType"
-                filterable
-                @change="educationChange"
-                :disabled="
-                  browseStatus ||
-                  warehouseDrList.length > 0 ||
-                  warehouseCrList.length > 0 ||
-                  form.warehouseStatus > 3
-                "
               >
                 <el-option
-                  v-for="(item, index) in businessTypeOption"
+                  v-for="(item, index) in fFeetUnitOptions"
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -414,31 +389,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item
-              v-if="dataShowcar == '1'"
-              label="计费单位"
-              prop="fFeetUnit"
-            >
-              <el-select
-                v-model="form.fFeetUnit"
-                placeholder="请选择计费单位"
-                clearable
-                :disabled="browseStatus || form.warehouseStatus > 3"
-                style="width: 80%"
-              >
-                <el-option
-                  v-for="(item, index) in fFeetUnitOptions"
-                  :key="index.dictValue"
-                  :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item
-              v-if="dataShowcar == '0'"
-              label="结算方式"
-              prop="fStltypeid"
-            >
+            <el-form-item label="结算方式" prop="fStltypeid">
               <el-select
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
@@ -553,6 +504,7 @@
           <el-row>
             <el-col :offset="16" :span="6">
               <el-button
+                v-if="dataShowcar == '0'"
                 @click="
                   detailsHidden2
                     ? (detailsHidden2 = false)
@@ -1188,7 +1140,7 @@
                 >撤回入库
               </el-button>
               <el-dropdown @command="handleCommand" style="margin-left: 10px">
-                <el-button :disabled="browseStatus" size="small" type="success">
+                <el-button size="small" type="success">
                   打印单据<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -1552,7 +1504,7 @@
             <el-col :span="6">
               <el-form-item label="车队" prop="fFleet">
                 <el-select
-                  style="width: 80%"
+                  style="width: 100%"
                   v-model="importList.fFleet"
                   clearable
                   filterable
@@ -2594,7 +2546,7 @@
       >
       <el-button
         type="primary"
-        v-if="approVal == true&&form.fBillstatus==6"
+        v-if="approVal == true && form.fBillstatus == 4"
         @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
@@ -2624,7 +2576,7 @@
         >保 存</el-button
       >
       <el-button
-        :disabled="form.fBillstatus >3"
+        :disabled="form.fBillstatus > 3"
         style="background-color: #008000; color: #fff"
         @click="submitForm()"
         >请核</el-button
@@ -2929,91 +2881,91 @@ export default {
           width: 100,
         },
         {
-          surface: "13",
+          surface: "14",
           label: "fTruckno",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "16",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "17",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "18",
           label: "fSerialNumber",
           name: "流水号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "19",
           label: "fCntrno",
           name: "箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "20",
           label: "fLntype",
           name: "装卸方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "21",
           label: "fForkliftman",
           name: "叉车工",
           checked: 0,
           width: 100,
         },
         {
-          surface: "21",
+          surface: "22",
           label: "fStevedore",
           name: "装卸工",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "24",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "24",
+          surface: "25",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "25",
+          surface: "26",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -3084,14 +3036,15 @@ export default {
     this.getConfigKey("data_showcar").then((response) => {
       this.dataShowcar = response.msg;
       if (this.dataShowcar == "0") {
-        this.detailsHidden2 = true;
-        this.form.fBusinessType = "0";
-      } else {
         this.detailsHidden2 = false;
+        
+      } else {
+        this.detailsHidden2 = true;
       }
     });
     this.getConfigKey("instock.orders.approval").then((response) => {
       this.showApproval = response.msg;
+      console.log(this.showApproval);
     });
     listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.warehouseOptions = response.rows;
@@ -3238,9 +3191,9 @@ export default {
       this.CntrTable = [];
       this.sumMum = 0;
       if (this.dataShowcar == "0") {
-        this.detailsHidden2 = true;
-      } else {
         this.detailsHidden2 = false;
+      } else {
+        this.detailsHidden2 = true;
       }
       if (this.$route.query.id) {
         this.approVal = true;
@@ -3902,10 +3855,15 @@ export default {
             this.relevantAttachments = response.data.enclosures;
           }
         } else {
+          this.approvalStatus = false;
+          this.browseStatus = false;
           this.$set(this.form, "fId", null);
           this.$set(this.form, "fMblno", null);
           this.$set(this.form, "fMarks", null);
           this.$set(this.form, "fProductName", null);
+          this.$set(this.form, "warehouseStatus", null);
+          this.$set(this.form, "fBillstatus", null);
+          this.$set(this.form, "fItemsStatus", null);
           this.$set(this.form, "fNetweight", 0);
           this.$set(this.form, "fPlanvolumn", 0);
           this.$set(this.form, "fGrossweight", 0);
@@ -4778,6 +4736,8 @@ export default {
           this.$set(this.form, "fTrademodeid", "1");
           this.$set(this.form, "createTime", Date.parse(new Date()));
           this.$set(this.form, "fBstime", Date.parse(new Date()));
+          this.$set(this.form, "fBusinessType", "0");
+          this.$set(this.form, "fFeetUnit", "2");
         }
         if (response.dept !== null) {
           this.deptOptions = [];

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -83,20 +83,25 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="结算方式" prop="fStltypeid">
+          <el-form-item label="作业类型" prop="fBusinessType">
             <el-select
-              v-model="form.fStltypeid"
-              placeholder="请选择结算方式"
-              clearable
-              :disabled="browseStatus || form.warehouseStatus > 3"
               style="width: 80%"
+              v-model="form.fBusinessType"
+              filterable
+              @change="educationChange"
+              :disabled="
+                browseStatus ||
+                warehouseDrList.length > 0 ||
+                warehouseCrList.length > 0 ||
+                form.warehouseStatus > 3
+              "
             >
               <el-option
-                v-for="(item, index) in fStltypeOptions"
+                v-for="(item, index) in businessTypeOption"
                 :key="index.dictValue"
                 :label="item.dictLabel"
                 :value="item.dictValue"
-              />
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -271,25 +276,20 @@
       <div v-if="detailsHidden2">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="作业类型" prop="fBusinessType">
+            <el-form-item label="结算方式" prop="fStltypeid">
               <el-select
+                v-model="form.fStltypeid"
+                placeholder="请选择结算方式"
+                clearable
+                :disabled="browseStatus || form.warehouseStatus > 3"
                 style="width: 80%"
-                v-model="form.fBusinessType"
-                filterable
-                @change="educationChange"
-                :disabled="
-                  browseStatus ||
-                  warehouseDrList.length > 0 ||
-                  warehouseCrList.length > 0 ||
-                  form.warehouseStatus > 3
-                "
               >
                 <el-option
-                  v-for="(item, index) in businessTypeOption"
+                  v-for="(item, index) in fStltypeOptions"
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -435,6 +435,7 @@
           <el-row>
             <el-col :offset="16" :span="6">
               <el-button
+                v-if="dataShowcar == '0'"
                 @click="
                   detailsHidden2
                     ? (detailsHidden2 = false)
@@ -812,7 +813,7 @@
                 >撤回出库
               </el-button>
               <el-dropdown @command="handleCommand" style="margin-left: 10px">
-                <el-button :disabled="browseStatus" size="small" type="success">
+                <el-button size="small" type="success">
                   打印单据<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -2675,7 +2676,7 @@
       >
       <el-button
         type="primary"
-        v-if="approVal == true&&form.fBillstatus==6"
+        v-if="approVal == true && form.fBillstatus == 6"
         @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
@@ -2705,7 +2706,7 @@
         >保 存</el-button
       >
       <el-button
-        :disabled="form.fBillstatus >3"
+        :disabled="form.fBillstatus > 3"
         style="background-color: #008000; color: #fff"
         @click="submitForm()"
         >请核</el-button
@@ -3235,9 +3236,8 @@ export default {
     this.getRowList2 = this.tableDate2;
     this.getConfigKey("data_showcar").then((response) => {
       this.dataShowcar = response.msg;
-      if (this.dataShowcar == "1") {
+      if (this.dataShowcar == "0") {
         this.detailsHidden2 = false;
-        this.form.fBusinessType = "5";
       } else {
         this.detailsHidden2 = true;
       }
@@ -3369,7 +3369,7 @@ export default {
       this.warehouseCrList = [];
       this.warehouseDrList = [];
       this.CntrTable = [];
-      if (this.dataShowcar == "1") {
+      if (this.dataShowcar == "0") {
         this.detailsHidden2 = false;
       } else {
         this.detailsHidden2 = true;
@@ -5183,6 +5183,8 @@ export default {
           this.$set(this.form, "fTrademodeid", "1");
           this.$set(this.form, "createTime", Date.parse(new Date()));
           this.$set(this.form, "fBstime", Date.parse(new Date()));
+          this.$set(this.form, "fBusinessType", "5");
+          this.$set(this.form, "fFeetUnit", "2");
         }
         if (response.dept !== null) {
           this.deptOptions = [];

src/views/finance/charge/index.vue

@@ -2288,6 +2288,7 @@ export default {
     },
     immediateApproval(status) {
       this.addOrUpdateVisib = true;
+      console.log(this.approval.actId)
       this.$nextTick(() => {
         if(Cookies.get("sysType") == 3){
           this.$refs.ApprovalComments.init(
@@ -2297,7 +2298,7 @@ export default {
         }else{
           this.$refs.ApprovalComments.init(
             this.approval.billId,status,
-            this.approval.actId
+            this.contrastId
           );
         }
       });

src/views/finance/payment/index.vue

@@ -3005,7 +3005,7 @@ export default {
         }else{
           this.$refs.ApprovalComments.init(
             this.approval.billId,status,
-            this.approval.actId
+            this.contrastId
           );
         }
       });