新建分支

src/api/warehouseBusiness/warehouseInStock.js

@@ -101,6 +101,13 @@ export function revoke(fId) {
   })
 }
 
+// 接单撤销(请核)
+export function ordersRevoke(fId) {
+  return request({
+    url: '/warehouseBusiness/inStock/withdrawOrdersById/' + fId,
+    method: 'get',
+  })
+}
 // 状态为4撤销(请核)
 export function revokeTwo(data) {
   return request({
@@ -140,3 +147,12 @@ export function detailStock(query) {
     params: query
   })
 }
+
+//主表审核
+export function submitWarehousingApproval(data) {
+  return request({
+    url: '/warehouseBusiness/inStock/submitWarehousingApproval',
+    method: 'post',
+    data: data
+  })
+}

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -2535,13 +2535,13 @@
         type="primary"
         :disabled="approvalStatus"
         v-if="form.fBillstatus > 3"
-        @click="addOrUpdateHandle(form)"
+        @click="addOrUpdateHandle(form, 'f_billstatus')"
         >查看审批</el-button
       >
       <el-button
         type="primary"
         v-if="approVal === true"
-        @click="addOrUpdateHand(form)"
+        @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
       <el-button :disabled="browseStatus" type="primary" @click="saveForm()"
@@ -2560,7 +2560,7 @@
         type="danger"
         v-if="form.fBillstatus === 4 && current == before"
         :disabled="doNot"
-        @click="revokeTwo"
+        @click="revokeTwo('f_billstatus')"
         >撤销审批</el-button
       >
       <el-button @click="cancel">取 消</el-button>
@@ -3489,11 +3489,12 @@ export default {
       this.whgenlegVisible = false;
     },
     //撤销审批
-    revokeTwo() {
+    revokeTwo(status) {
       let data = {
         actId: 140,
         billId: this.form.fId,
         id: this.form.fId,
+        fidStatus: status,
       };
       RevocationApproval(data).then((data) => {
         if (data.code === 200) {
@@ -3510,16 +3511,16 @@ export default {
       this.addOrUpdateVisib = false;
       this.$router.push({ path: "/index" });
     },
-    addOrUpdateHandle(form) {
+    addOrUpdateHandle(form,status) {
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, 140);
+        this.$refs.addOrUpdate.init(form.fId, 140,status);
       });
     },
-    addOrUpdateHand(form) {
+    addOrUpdateHand(form,status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, 110);
+        this.$refs.ApprovalComments.init(form.fId,status, 140);
       });
     },
     changefStltype(row) {

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -1352,9 +1352,7 @@
             <template slot-scope="scope">
               <!-- <el-button size="small">审核费用</el-button> -->
               <el-button
-                @click.native.prevent="
-                  deleteRow(scope.$index, warehouseCrList)
-                "
+                @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
                 size="small"
                 :disabled="browseStatus"
                 >移除</el-button
@@ -1709,13 +1707,13 @@
         type="primary"
         :disabled="approvalStatus"
         v-if="form.fBillstatus > 3"
-        @click="addOrUpdateHandle(form)"
+        @click="addOrUpdateHandle(form, 'f_billstatus')"
         >查看审批</el-button
       >
       <el-button
         type="primary"
         v-if="approVal === true"
-        @click="addOrUpdateHand(form)"
+        @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
       <el-button :disabled="browseStatus" type="primary" @click="saveForm()"
@@ -1734,7 +1732,7 @@
         type="danger"
         v-if="form.fBillstatus === 4 && current == before"
         :disabled="doNot"
-        @click="revokeTwo"
+        @click="revokeTwo('f_billstatus')"
         >撤销审批</el-button
       >
       <el-button @click="cancel">取 消</el-button>
@@ -2607,11 +2605,12 @@ export default {
       this.whgenlegVisible = false;
     },
     //撤销审批
-    revokeTwo() {
+    revokeTwo(status) {
       let data = {
         actId: 130,
         billId: this.form.fId,
         id: this.form.fId,
+        fidStatus: status,
       };
       RevocationApproval(data).then((data) => {
         if (data.code === 200) {
@@ -2628,16 +2627,16 @@ export default {
       this.addOrUpdateVisib = false;
       this.$router.push({ path: "/index" });
     },
-    addOrUpdateHandle(form) {
+    addOrUpdateHandle(form, status) {
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, 130);
+        this.$refs.addOrUpdate.init(form.fId, 130, status);
       });
     },
-    addOrUpdateHand(form) {
+    addOrUpdateHand(form, status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, 130);
+        this.$refs.ApprovalComments.init(form.fId, status, 130);
       });
     },
     changefStltype(row) {

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -20,6 +20,48 @@
           >返回列表</el-button
         >
       </div>
+      <div v-if="showApproval == 0">
+        <el-button
+          type="info"
+          :disabled="browseStatus"
+          size="small"
+          @click="addOrUpdateHandle(form, 'warehouse_status')"
+          v-if="form.warehouseStatus > 3"
+          >查看接单审批
+        </el-button>
+        <el-button
+          type="info"
+          :disabled="browseStatus"
+          size="small"
+          @click="addOrUpdateHand(form, 'warehouse_status')"
+          v-if="form.warehouseStatus > 3 && approVal == true"
+          >接单审批
+        </el-button>
+        <el-button
+          type="info"
+          :disabled="browseStatus||form.warehouseStatus==4"
+          size="small"
+          @click="verifyForm"
+          v-if="form.fBillstatus"
+          >接单请核
+        </el-button>
+        <el-button
+          type="info"
+          :disabled="browseStatus"
+          size="small"
+          @click="ordersRevoke"
+          v-if="form.warehouseStatus > 3"
+          >撤销接单请核
+        </el-button>
+        <el-button
+          type="info"
+          :disabled="browseStatus"
+          size="small"
+          @click="revokeTwo('warehouse_status')"
+          v-if="form.warehouseStatus > 3"
+          >撤销接单审批
+        </el-button>
+      </div>
       <!-- <el-button icon="el-icon-refresh" circle size="mini"></el-button> -->
     </div>
 
@@ -35,7 +77,7 @@
               placeholder="请输入关键词"
               style="width: 80%"
               @change="changefStltype"
-              :disabled="detailList.length > 0"
+              :disabled="detailList.length > 0 || form.warehouseStatus > 3"
             >
               <el-option
                 v-for="(item, index) in fMblnoOptions"
@@ -56,7 +98,7 @@
               v-model="form.fStltypeid"
               placeholder="请选择结算方式"
               clearable
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               style="width: 80%"
             >
               <el-option
@@ -78,7 +120,7 @@
               v-model="form.fFeetUnit"
               placeholder="请选择计费单位"
               clearable
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               style="width: 80%"
             >
               <el-option
@@ -94,7 +136,11 @@
           <el-form-item label="提单号" prop="fMblno">
             <el-input
               v-model="form.fMblno"
-              :disabled="browseStatus || detailList.length > 0"
+              :disabled="
+                browseStatus ||
+                detailList.length > 0 ||
+                form.warehouseStatus > 3
+              "
               style="width: 80%"
               placeholder="请输入提单号"
             />
@@ -108,7 +154,7 @@
               v-model="form.fBsdate"
               style="width: 80%"
               type="date"
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               value-format="timestamp"
               placeholder="请选择计划日期"
               @change="changeDate"
@@ -120,7 +166,7 @@
           <el-form-item label="入库时间" prop="fBstime">
             <el-time-picker
               style="width: 80%"
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               v-model="form.fBstime"
               :picker-options="{
                 selectableRange: '00:00:00 - 23:59:59',
@@ -138,7 +184,7 @@
               type="date"
               style="width: 80%"
               value-format="timestamp"
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               placeholder="仓储费计算日期"
             >
             </el-date-picker>
@@ -151,7 +197,11 @@
               filterable
               v-model="form.fGoodsid"
               style="width: 80%"
-              :disabled="browseStatus || detailList.length > 0"
+              :disabled="
+                browseStatus ||
+                detailList.length > 0 ||
+                form.warehouseStatus > 3
+              "
               placeholder="请选择品名"
             >
               <el-option
@@ -168,7 +218,11 @@
             <el-select
               v-model="form.fWarehouseid"
               filterable
-              :disabled="browseStatus || detailList.length > 0"
+              :disabled="
+                browseStatus ||
+                detailList.length > 0 ||
+                form.warehouseStatus > 3
+              "
               style="width: 80%"
               placeholder="请选择"
             >
@@ -187,7 +241,7 @@
               v-model="form.fStorekeeper"
               filterable
               clearable
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               style="width: 80%"
               placeholder="请输入模糊查找"
             >
@@ -208,7 +262,7 @@
               v-model="form.fEta"
               style="width: 80%"
               type="date"
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               value-format="timestamp"
               placeholder="到港日期"
             >
@@ -221,7 +275,7 @@
               v-model="form.freeContainerDate"
               style="width: 80%"
               type="date"
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               value-format="timestamp"
               placeholder="请选择箱使日期"
             >
@@ -234,7 +288,7 @@
             <el-input
               v-model="form.fCustomno"
               style="width: 80%"
-              :disabled="browseStatus"
+              :disabled="browseStatus || form.warehouseStatus > 3"
               placeholder="报关单号"
             />
           </el-form-item>
@@ -249,7 +303,9 @@
               maxlength="9"
               v-input-limit="0"
               placeholder="计划件数"
-              :disabled="browseStatus || current !== before"
+              :disabled="
+                browseStatus || current !== before || form.warehouseStatus > 3
+              "
             />
           </el-form-item>
         </el-col>
@@ -261,7 +317,9 @@
               maxlength="9"
               v-input-limit="2"
               placeholder="计划净重"
-              :disabled="browseStatus || current !== before"
+              :disabled="
+                browseStatus || current !== before || form.warehouseStatus > 3
+              "
               @change="tfNetweight"
             >
               <template slot="append">{{ tfNetweightnum }}吨</template>
@@ -276,7 +334,9 @@
               style="width: 80%"
               placeholder="计划毛重"
               maxlength="9"
-              :disabled="browseStatus || current !== before"
+              :disabled="
+                browseStatus || current !== before || form.warehouseStatus > 3
+              "
               @change="tfGrossweight"
             >
               <template slot="append">{{ tfGrossweightnum }}吨</template>
@@ -294,10 +354,10 @@
                 filterable
                 @change="educationChange"
                 :disabled="
-                  contrOl ||
                   browseStatus ||
                   warehouseDrList.length > 0 ||
-                  warehouseCrList.length > 0
+                  warehouseCrList.length > 0 ||
+                  form.warehouseStatus > 3
                 "
               >
                 <el-option
@@ -317,7 +377,7 @@
                 clearable
                 filterable
                 placeholder="请输入关键词"
-                :disabled="contrOl || browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
               >
                 <el-option
                   v-for="(item, index) in fCompanyOptIons"
@@ -344,7 +404,7 @@
                 clearable
                 filterable
                 placeholder="请输入关键词"
-                :disabled="contrOl || browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
               >
                 <el-option
                   v-for="(item, index) in fleetOptions"
@@ -367,7 +427,7 @@
                 v-model="form.fFeetUnit"
                 placeholder="请选择计费单位"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -387,7 +447,7 @@
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -412,7 +472,7 @@
               <el-input
                 v-model="form.fTruckno"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 placeholder="车号"
               />
             </el-form-item>
@@ -430,7 +490,7 @@
               <el-input
                 v-model="form.fDriverName"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 placeholder="司机姓名"
               />
             </el-form-item>
@@ -455,7 +515,7 @@
                   <el-input
                     v-model="form.fDriverIdCar"
                     style="width: 80%"
-                    :disabled="browseStatus"
+                    :disabled="browseStatus||form.warehouseStatus>3"
                     placeholder="司机身份证"
                   />
                 </el-form-item>
@@ -473,7 +533,7 @@
                   <el-input
                     v-model="form.fDriverTel"
                     style="width: 80%"
-                    :disabled="browseStatus"
+                    :disabled="browseStatus||form.warehouseStatus>3"
                     placeholder="司机电话"
                   />
                 </el-form-item>
@@ -488,7 +548,7 @@
                   style="width: 91.5%"
                   v-model="form.remark"
                   type="textarea"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus||form.warehouseStatus>3"
                   placeholder="请输入内容"
                 />
               </el-form-item>
@@ -592,7 +652,7 @@
               <el-input
                 v-model="form.fContacts"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 placeholder="仓库联系人"
               />
             </el-form-item>
@@ -601,7 +661,7 @@
             <el-form-item label="仓库电话" prop="fTel">
               <el-input
                 v-model="form.fTel"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
                 placeholder="请输仓库入电话"
               />
@@ -612,7 +672,7 @@
               <el-input
                 v-model="form.fVslvoy"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 placeholder="船名航次"
               />
             </el-form-item>
@@ -627,6 +687,7 @@
                 filterable
                 placeholder="请输入关键词"
                 style="width: 80%"
+                :disabled="browseStatus||form.warehouseStatus>3"
               >
                 <el-option
                   v-for="(item, index) in fSbuOptions"
@@ -652,7 +713,7 @@
               <el-select
                 v-model="form.fTrademodeid"
                 placeholder="请选择贸易方式"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 clearable
                 style="width: 80%"
               >
@@ -696,7 +757,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item disabled label="制单日期" prop="createTime">
+            <el-form-item label="制单日期" prop="createTime">
               <el-date-picker
                 v-model="form.createTime"
                 size="large"
@@ -717,7 +778,7 @@
                 v-model="form.fIfweigh"
                 placeholder="请选择是否过磅"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -767,7 +828,7 @@
                 v-model="form.fIfpledge"
                 placeholder="请选择是否质押"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -786,7 +847,7 @@
                 filterable
                 clearable
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 placeholder="请输入关键词"
               >
                 <el-option
@@ -806,7 +867,7 @@
                 v-model="form.fBusinessAttribution"
                 placeholder="请选择业务归属"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -826,7 +887,7 @@
                 filterable
                 placeholder="请输入关键词"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -843,7 +904,7 @@
                 v-model="form.fDeclarationElements"
                 placeholder="请选择申报要素"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -864,7 +925,7 @@
                 style="width: 80%"
                 placeholder="料件号"
                 v-input-limit="0"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
               />
             </el-form-item>
           </el-col>
@@ -874,7 +935,7 @@
                 v-model="form.fIfinspection"
                 placeholder="是否法检"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -893,7 +954,7 @@
                 style="width: 80%"
                 placeholder="货值"
                 v-input-limit="2"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
               />
             </el-form-item>
           </el-col>
@@ -905,7 +966,7 @@
                 v-model="form.fWeighingDate"
                 style="width: 80%"
                 type="date"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 value-format="timestamp"
                 placeholder="请选择过磅时间"
               >
@@ -918,7 +979,7 @@
                 v-model="form.fIfsampling"
                 placeholder="是否取样"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -936,7 +997,7 @@
                 v-model="form.sendSampleDate"
                 style="width: 80%"
                 type="date"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 value-format="timestamp"
                 placeholder="请选择送样时间"
               >
@@ -951,7 +1012,7 @@
                 v-model="form.fIfweightRecovery"
                 placeholder="是否复磅"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 style="width: 80%"
               >
                 <el-option
@@ -969,7 +1030,7 @@
                 v-model="form.weightRecoveryDate"
                 style="width: 80%"
                 type="date"
-                :disabled="browseStatus"
+                :disabled="browseStatus||form.warehouseStatus>3"
                 value-format="timestamp"
                 placeholder="请选择复磅时间"
               >
@@ -2533,13 +2594,13 @@
         type="primary"
         :disabled="approvalStatus"
         v-if="form.fBillstatus > 3"
-        @click="addOrUpdateHandle(form)"
+        @click="addOrUpdateHandle(form, 'f_billstatus')"
         >查看审批</el-button
       >
       <el-button
         type="primary"
         v-if="approVal === true"
-        @click="addOrUpdateHand(form)"
+        @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
       <el-button
@@ -2580,7 +2641,7 @@
         type="danger"
         v-if="form.fBillstatus === 4 && current == before"
         :disabled="doNot"
-        @click="revokeTwo"
+        @click="revokeTwo('f_billstatus')"
         >撤销审批</el-button
       >
       <el-button @click="cancel">取 消</el-button>
@@ -2604,6 +2665,8 @@ import {
   revoke,
   revokeTwo,
   delinStock_s,
+  submitWarehousingApproval,
+  ordersRevoke,
 } from "@/api/warehouseBusiness/warehouseInStock";
 import { operationAgreement } from "@/api/agreement/agreement";
 import { listCorps } from "@/api/basicdata/corps";
@@ -2705,7 +2768,6 @@ export default {
       fFeetUnitOptions: [],
       current: "",
       before: "",
-      contrOl: false,
       isrequired: 2,
       isrequired2: 2,
       detailsHidden: false,
@@ -2976,6 +3038,7 @@ export default {
       ifinspectionList: [],
       ifsamplingList: [],
       ifweightRecoveryList: [],
+      showApproval: null,
     };
   },
   created() {
@@ -3033,6 +3096,9 @@ export default {
         this.form.fBusinessType = "0";
       }
     });
+    this.getConfigKey("instock.orders.approval").then((response) => {
+      this.showApproval = response.msg;
+    });
     listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.warehouseOptions = response.rows;
     });
@@ -3298,17 +3364,38 @@ export default {
     onEnd() {
       this.drag = false;
     },
+    //撤销请核
+    revoke() {
+      revoke(this.form.fId).then((data) => {
+        if (data.code === 200) {
+          this.browseStatus = false;
+          this.msgSuccess("撤销成功");
+        }
+      });
+    },
+    ordersRevoke() {
+      ordersRevoke(this.form.fId).then((data) => {
+        if (data.code === 200) {
+          this.browseStatus = false;
+          this.msgSuccess("撤销成功");
+        }
+      });
+    },
     //撤销审批
-    revokeTwo() {
+    revokeTwo(status) {
       let data = {
         actId: 110,
         billId: this.form.fId,
         id: this.form.fId,
+        fidStatus: status,
       };
       revokeTwo(data).then((data) => {
         if (data.code === 200) {
           this.browseStatus = false;
           this.msgSuccess("撤销成功");
+          if(status){
+            this.$set(this.form,"warehouseStatus",2)
+          }
         }
       });
     },
@@ -3320,17 +3407,17 @@ export default {
       this.addOrUpdateVisib = false;
       this.$router.push({ path: "/index" });
     },
-    addOrUpdateHandle(form) {
+    addOrUpdateHandle(form, status) {
       this.addOrUpdateVisible = true;
       let actId = "110";
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, actId);
+        this.$refs.addOrUpdate.init(form.fId, actId, status);
       });
     },
-    addOrUpdateHand(form) {
+    addOrUpdateHand(form, status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, 110);
+        this.$refs.ApprovalComments.init(form.fId, status, 110);
       });
     },
     changefStltype(row) {
@@ -3910,6 +3997,92 @@ export default {
         }
       });
     },
+    verifyForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          // 附件数据
+          this.form.fBillingway = this.form.fFeetUnit;
+          if (this.detailList.length == 0) {
+            this.form.fNetweight = 0;
+            this.form.fPlanvolumn = 0;
+            this.form.fGrossweight = 0;
+          } else {
+            this.form.fNetweight = this.fNetweight;
+            this.form.fPlanvolumn = this.fPlanvolumn;
+            this.form.fGrossweight = this.fGrossweight;
+          }
+          if (this.CntrTable.length > 0) {
+            let arr = [];
+            this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                if (item.fId == e.fCntrid) {
+                  arr.push(item.fName + "X" + e.fCntrcount);
+                }
+              });
+            });
+            arr = [...new Set(arr)];
+            this.form.fCntval = arr.join(",");
+          } else {
+            this.form.fCntval = null;
+          }
+          if (this.detailList.length > 0) {
+            let arr = [];
+            this.detailList.map((e) => {
+              this.goodsOptions.map((item) => {
+                if (e.fGoodsid == item.fId) {
+                  arr.push(item.fName);
+                }
+              });
+            });
+            arr = [...new Set(arr)];
+            this.form.fProductName = arr.join(",");
+          } else {
+            this.form.fProductName = "";
+          }
+          if (this.detailList.length > 0) {
+            let arr = [];
+            this.detailList.map((e) => {
+              arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(",");
+          } else {
+            this.form.fMarks = "";
+          }
+          let formData = new window.FormData();
+          formData.append("tWarehouseBills", JSON.stringify(this.form));
+          // 库存明细
+          formData.append(
+            "tWarehousebillsitems",
+            JSON.stringify(this.detailList)
+          );
+          // 附件数据
+          formData.append(
+            "tEnclosure",
+            JSON.stringify(this.relevantAttachments)
+          );
+          // 费用明细付款
+          formData.append(
+            "tWarehousebillsfeesCr",
+            JSON.stringify(this.warehouseCrList)
+          );
+          // 收款
+          formData.append(
+            "tWarehousebillsfeesDr",
+            JSON.stringify(this.warehouseDrList)
+          );
+          formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
+          formData.append("tCntr", JSON.stringify(this.CntrTable));
+          submitWarehousingApproval(formData).then((response) => {
+            if (response.code == 200) {
+              this.msgSuccess("请核成功");
+              this.$set(this.form, "warehouseStatus", 4);
+              this.cancel()
+            }
+          });
+        }
+      });
+    },
     saveForm(status) {
       this.$refs["form"].validate((valid) => {
         if (valid) {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -2618,13 +2618,13 @@
         type="primary"
         :disabled="approvalStatus"
         v-if="form.fBillstatus > 3"
-        @click="addOrUpdateHandle(form)"
+        @click="addOrUpdateHandle(form, 'f_billstatus')"
         >查看审批</el-button
       >
       <el-button
         type="primary"
         v-if="approVal === true"
-        @click="addOrUpdateHand(form)"
+        @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
       <el-button
@@ -2665,7 +2665,7 @@
         type="danger"
         v-if="form.fBillstatus === 4 && current == before"
         :disabled="doNot"
-        @click="revokeTwo"
+        @click="revokeTwo('f_billstatus')"
         >撤销审批</el-button
       >
       <el-button @click="cancel">取 消</el-button>
@@ -3592,12 +3592,22 @@ export default {
       });
       this.whgenlegVisible = false;
     },
+        //撤销请核
+    revoke() {
+      revoke(this.form.fId).then((data) => {
+        if (data.code === 200) {
+          this.browseStatus = false;
+          this.msgSuccess("撤销成功");
+        }
+      });
+    },
     //撤销审批
-    revokeTwo() {
+    revokeTwo(status) {
       let data = {
         actId: 120,
         billId: this.form.fId,
         id: this.form.fId,
+        fidStatus: status,
       };
       revokeTwo(data).then((data) => {
         if (data.code === 200) {
@@ -3614,16 +3624,16 @@ export default {
       this.addOrUpdateVisib = false;
       this.$router.push({ path: "/index" });
     },
-    addOrUpdateHandle(form) {
+    addOrUpdateHandle(form, status) {
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, 120);
+        this.$refs.addOrUpdate.init(form.fId, 120, status);
       });
     },
-    addOrUpdateHand(form) {
+    addOrUpdateHand(form, status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, 110);
+        this.$refs.ApprovalComments.init(form.fId,status,120);
       });
     },
     changefStltype(row) {

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -2103,9 +2103,7 @@
             <template slot-scope="scope">
               <!-- <el-button size="small">审核费用</el-button> -->
               <el-button
-                @click.native.prevent="
-                  deleteRow(scope.$index, warehouseCrList)
-                "
+                @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
                 size="small"
                 :disabled="browseStatus"
                 >移除</el-button
@@ -2843,13 +2841,13 @@
         type="primary"
         :disabled="approvalStatus"
         v-if="form.fBillstatus > 3"
-        @click="addOrUpdateHandle(form)"
+        @click="addOrUpdateHandle(form, 'f_billstatus')"
         >查看审批</el-button
       >
       <el-button
         type="primary"
         v-if="approVal === true"
-        @click="addOrUpdateHand(form)"
+        @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
       <el-button :disabled="browseStatus" type="primary" @click="saveForm()"
@@ -2868,7 +2866,7 @@
         type="danger"
         v-if="form.fBillstatus === 4 && current == before"
         :disabled="doNot"
-        @click="revokeTwo"
+        @click="revokeTwo('f_billstatus')"
         >撤销审批</el-button
       >
       <el-button @click="cancel">取 消</el-button>
@@ -3797,11 +3795,12 @@ export default {
       this.whgenlegVisible = false;
     },
     //撤销审批
-    revokeTwo() {
+    revokeTwo(status) {
       let data = {
         actId: 140,
         billId: this.form.fId,
         id: this.form.fId,
+        fidStatus: status,
       };
       RevocationApproval(data).then((data) => {
         if (data.code === 200) {
@@ -3815,19 +3814,19 @@ export default {
       this.addOrUpdateVisible = false;
     },
     returnData() {
-         this.addOrUpdateVisib = false;
+      this.addOrUpdateVisib = false;
       this.$router.push({ path: "/index" });
     },
-    addOrUpdateHandle(form) {
+    addOrUpdateHandle(form,status) {
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, 140);
+        this.$refs.addOrUpdate.init(form.fId, 140,status);
       });
     },
-    addOrUpdateHand(form) {
+    addOrUpdateHand(form,status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, 110);
+        this.$refs.ApprovalComments.init(form.fId,status,140);
       });
     },
     changefStltype(row) {

src/views/agreement/agreementTask/index.vue

@@ -535,7 +535,7 @@
         >撤销请核</el-button
       >
       <el-button
-        @click="revocationApproval"
+        @click="revocationApproval('f_billstatus')"
         :disabled="tablefilter"
         v-if="form.fBillstatus === '4' && operator === lander"
         type="danger"
@@ -648,10 +648,10 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="approvalProhibit" @click="immediateApproval"
+        <el-button v-if="approvalProhibit" @click="immediateApproval('f_billstatus')"
           >审批</el-button
         >
-        <el-button v-if="form.fBillstatus > 2" @click="viewAudit"
+        <el-button v-if="form.fBillstatus > 2" @click="viewAudit('f_billstatus')"
           >查看审批</el-button
         >
         <el-button
@@ -937,10 +937,10 @@ export default {
         this.lander = response.user.userName;
       });
     },
-    immediateApproval() {
+    immediateApproval(status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(this.approval.billId, 320);
+        this.$refs.ApprovalComments.init(this.approval.billId,status, 320);
       });
     },
     adoPt() {
@@ -981,13 +981,13 @@ export default {
         });
       }
     },
-    viewAudit() {
+    viewAudit(status) {
       this.addOrUpdateVisible = true;
       this.addOrUpdateVisib = false;
       let id = "448";
       let actId = "110";
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.form.fId, 320);
+        this.$refs.addOrUpdate.init(this.form.fId, 320,status);
       });
     },
     returnData() {
@@ -1109,11 +1109,12 @@ export default {
         this.title = "查看作业费";
       });
     },
-    revocationApproval() {
+    revocationApproval(status) {
       let data = {
         id: this.form.fId,
         actId: 320,
         billId: this.form.fId,
+        fidStatus: status,
       };
       revocation(data).then((data) => {
         if (data.code === 200) {

src/views/finance/applyForInvoice/chargeInvoice/index.vue

@@ -520,12 +520,12 @@
             type="danger"
             size="mini"
             :disabled="tablefilter"
-            @click="approvalRevocation"
+            @click="approvalRevocation('f_billstatus')"
             v-if="queryParams.fBillstatus === '4'"
           >撤销申请
           </el-button
           >
-          <el-button v-if="approve === true" size="mini" @click="immediateApproval"
+          <el-button v-if="approve === true" size="mini" @click="immediateApproval('f_billstatus')"
           >审批
           </el-button
           >
@@ -533,7 +533,7 @@
             type="primary"
             size="mini"
             v-if="queryParams.fBillstatus >= '3'"
-            @click="addOrUpdateHandle"
+            @click="addOrUpdateHandle('f_billstatus')"
           >查看审批流
           </el-button
           >
@@ -2476,11 +2476,12 @@ export default {
       })
       return sums
     },
-    approvalRevocation() {
+    approvalRevocation(status) {
       let data = {
         id: this.queryParams.fId,
         actId: this.contrastId,
-        billId: this.queryParams.fId
+        billId: this.queryParams.fId,
+        fidStatus: status,
       }
       revocation(data).then((data) => {
         if (data.code === 200) {
@@ -2613,12 +2614,13 @@ export default {
         this.Lander = response.user.userName
       })
     },
-    immediateApproval() {
+    immediateApproval(status) {
       this.addOrUpdateVisib = true
       this.$nextTick(() => {
         if (Cookies.get('sysType') == 3) {
           this.$refs.ApprovalComments.init(
             this.approval.billId,
+            status,
             470
           )
         } else {
@@ -2630,13 +2632,13 @@ export default {
       })
     },
     // 查看审批流
-    addOrUpdateHandle() {
+    addOrUpdateHandle(status) {
       this.addOrUpdateVisible = true
       this.addOrUpdateVisib = false
       let id = '448'
       let actId = '470'
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId)
+        this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId,status)
       })
     },
 

src/views/finance/charge/index.vue

@@ -586,18 +586,18 @@
             type="danger"
             size="mini"
             :disabled="tablefilter"
-            @click="approvalRevocation"
+            @click="approvalRevocation('f_billstatus')"
             v-show="queryParams.fBillstatus === '4'"
           >撤销审批</el-button
           >
-          <el-button v-if="approve === true" size="mini" @click="immediateApproval"
+          <el-button v-if="approve === true" size="mini" @click="immediateApproval('f_billstatus')"
           >审批</el-button
           >
           <el-button
             type="primary"
             size="mini"
             v-if="queryParams.fBillstatus >= '3'"
-            @click="addOrUpdateHandle"
+            @click="addOrUpdateHandle('f_billstatus')"
           >查看审批流</el-button
           >
           <el-button type="success" @click="submitForm(0)" size="mini" :disabled="notChange"
@@ -2113,12 +2113,13 @@ export default {
       });
       return sums;
     },
-    approvalRevocation() {
+    approvalRevocation(status) {
       if(Cookies.get("sysType") == 3){
         let data = {
           id: this.queryParams.fId,
           actId: 440,
           billId: this.queryParams.fId,
+          fidStatus: status,
         };
         revocation(data).then((data) => {
           if (data.code === 200) {
@@ -2133,6 +2134,7 @@ export default {
           id: this.queryParams.fId,
           actId: this.contrastId,
           billId: this.queryParams.fId,
+          fidStatus: status,
         };
         revocation(data).then((data) => {
           if (data.code === 200) {
@@ -2284,33 +2286,33 @@ export default {
         this.Lander = response.user.userName;
       });
     },
-    immediateApproval() {
+    immediateApproval(status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
         if(Cookies.get("sysType") == 3){
           this.$refs.ApprovalComments.init(
-            this.approval.billId,
+            this.approval.billId,status,
             440
           );
         }else{
           this.$refs.ApprovalComments.init(
-            this.approval.billId,
+            this.approval.billId,status,
             this.approval.actId
           );
         }
       });
     },
     // 查看审批流
-    addOrUpdateHandle() {
+    addOrUpdateHandle(status) {
       this.addOrUpdateVisible = true;
       this.addOrUpdateVisib = false;
       let id = "448";
       let actId = "110";
       this.$nextTick(() => {
         if(Cookies.get("sysType") == 3){
-          this.$refs.addOrUpdate.init(this.queryParams.fId, 440);
+          this.$refs.addOrUpdate.init(this.queryParams.fId, 440,status);
         }else{
-          this.$refs.addOrUpdate.init(this.queryParams.fId, 220);
+          this.$refs.addOrUpdate.init(this.queryParams.fId, 220,status);
         }
       });
     },

src/views/finance/contrast/index.vue

@@ -533,14 +533,14 @@
               size="mini"
               :disabled="disappear"
               v-if="queryParams.fBillstatus === '4'"
-              @click="backApproval"
+              @click="backApproval('f_billstatus')"
             >撤销审批</el-button>
-            <el-button v-if="approve === true" size="mini" @click="goApproval">审批</el-button>
+            <el-button v-if="approve === true" size="mini" @click="goApproval('f_billstatus')">审批</el-button>
             <el-button
               type="primary"
               size="mini"
               v-if="queryParams.fBillstatus >= '3'"
-              @click="addOrUpdateHandle()"
+              @click="addOrUpdateHandle('f_billstatus')"
             >查看审批流</el-button
             >
             <el-button
@@ -2270,12 +2270,13 @@ export default {
       Global.$emit("removeCache", "closeSelectedTag", view);
     },
     // 撤销审批
-    backApproval() {
+    backApproval(status) {
       if(Cookies.get("sysType") == 3){
         let data = {
           id: this.queryParams.fId,
           actId: 430,
           billId: this.queryParams.fId,
+          fidStatus: status,
         };
         RevocationApproval(data).then((response) => {
           if(response.code === 200){
@@ -2291,6 +2292,7 @@ export default {
           id: this.queryParams.fId,
           actId: this.contrastId,
           billId: this.queryParams.fId,
+          fidStatus: status,
         };
         RevocationApproval(data).then((response) => {
           this.msgSuccess("撤销审批成功");
@@ -2310,19 +2312,19 @@ export default {
       this.addOrUpdateVisible = false;
     },
     // 审批按钮
-    goApproval() {
+    goApproval(status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
         if(Cookies.get("sysType") == 3){
-          this.$refs.ApprovalComments.init(this.queryParams.fId, 430);
+          this.$refs.ApprovalComments.init(this.queryParams.fId,status,430);
 
         }else{
-          this.$refs.ApprovalComments.init(this.queryParams.fId, this.contrastId);
+          this.$refs.ApprovalComments.init(this.queryParams.fId, status,this.contrastId);
         }
       });
     },
     // 查看审批流
-    addOrUpdateHandle() {
+    addOrUpdateHandle(status) {
       this.addOrUpdateVisible = true;
       this.addOrUpdateVisib = false;
       let id = null;
@@ -2333,9 +2335,9 @@ export default {
       }
       this.$nextTick(() => {
         if(Cookies.get("sysType") == 3) {
-          this.$refs.addOrUpdate.init(id, 430);
+          this.$refs.addOrUpdate.init(id, 430,status);
         }else{
-          this.$refs.addOrUpdate.init(id, this.contrastId);
+          this.$refs.addOrUpdate.init(id, this.contrastId,status);
         }
       });
     },

src/views/finance/payment/index.vue

@@ -591,18 +591,18 @@
             type="danger"
             size="mini"
             :disabled="tablefilter"
-            @click="approvalRevocation"
+            @click="approvalRevocation('f_billstatus')"
             v-show="queryParams.fBillstatus === '4'"
           >撤销审批</el-button
           >
-          <el-button v-if="approve === true" size="mini" @click="immediateApproval"
+          <el-button v-if="approve === true" size="mini" @click="immediateApproval('f_billstatus')"
           >审批</el-button
           >
           <el-button
             type="primary"
             size="mini"
             v-if="queryParams.fBillstatus >= '3'"
-            @click="addOrUpdateHandle"
+            @click="addOrUpdateHandle('f_billstatus')"
           >查看审批流</el-button
           >
           <el-button type="success" @click="submitForm(0)" size="mini" :disabled="notChange"
@@ -2787,12 +2787,13 @@ export default {
       });
       return sums;
     },
-    approvalRevocation() {
+    approvalRevocation(status) {
       if(Cookies.get("sysType") == 3){
         let data = {
           id: this.queryParams.fId,
           actId: 450,
           billId: this.queryParams.fId,
+          fidStatus: status,
         };
         revocation(data).then((data) => {
           if (data.code === 200) {
@@ -2807,6 +2808,7 @@ export default {
           id: this.queryParams.fId,
           actId: this.contrastId,
           billId: this.queryParams.fId,
+          fidStatus: status,
         };
         revocation(data).then((data) => {
           if (data.code === 200) {
@@ -2992,33 +2994,33 @@ export default {
         this.Lander = response.user.userName;
       });
     },
-    immediateApproval() {
+    immediateApproval(status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
         if(Cookies.get("sysType") == 3){
           this.$refs.ApprovalComments.init(
-            this.approval.billId,
+            this.approval.billId,status,
             450
           );
         }else{
           this.$refs.ApprovalComments.init(
-            this.approval.billId,
+            this.approval.billId,status,
             this.approval.actId
           );
         }
       });
     },
     // 查看审批流
-    addOrUpdateHandle() {
+    addOrUpdateHandle(status) {
       this.addOrUpdateVisible = true;
       this.addOrUpdateVisib = false;
       let id = "448";
       let actId = "110";
       this.$nextTick(() => {
         if(Cookies.get("sysType") == 3){
-          this.$refs.addOrUpdate.init(this.queryParams.fId, 450);
+          this.$refs.addOrUpdate.init(this.queryParams.fId, 450,status);
         }else{
-          this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId);
+          this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId,status);
         }
       });
     },

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -1134,14 +1134,14 @@
                  @click="feeSubmission"
       >费用请核
       </el-button>
-      <el-button type="success" v-if="approVal" @click="addOrUpdateHand(form)">审 批</el-button>
+      <el-button type="success" v-if="approVal" @click="addOrUpdateHand(form,'f_billstatus')">审 批</el-button>
       <el-button type="danger" :disabled="disappear" v-if="form.moneyStatus === 4 && current == before"
-                 @click="revokeTwo"
+                 @click="revokeTwo('f_billstatus')"
       >撤销请核
       </el-button>
       <el-button type="primary"
                  v-if="form.fBillstatus != 11 ||form.moneyStatus == null || form.moneyStatus != null && form.moneyStatus >= 4"
-                 @click="addOrUpdateHandle(form)"
+                 @click="addOrUpdateHandle(form,'f_billstatus')"
       >查看审批
       </el-button>
       <el-button icon="el-icon-arrow-left" type="danger" v-if="cancelButton === true" @click="cancel">返回列表</el-button>
@@ -1572,11 +1572,12 @@ export default {
       }
     },
     //撤销审批
-    revokeTwo() {
+    revokeTwo(status) {
       let data = {
         actId: 460,
         billId: this.form.fId,
-        id: this.form.fId
+        id: this.form.fId,
+        fidStatus: status,
       }
       revokeTwo(data).then((data) => {
         if (data.code === 200) {
@@ -1886,7 +1887,7 @@ export default {
       this.amountCr = sums[8]
       return sums
     },
-    addOrUpdateHand(form) {
+    addOrUpdateHand(form,status) {
       // if(form.fMblno == null){
       //   this.addOrUpdateVisib = false;
       //   this.$message.error("提单号为空，请维护提单号")
@@ -1901,13 +1902,13 @@ export default {
             let actId = ''
             if (this.form.fBillstatus < 6) {
               actId = '410'
-              this.$refs.ApprovalComments.init(form.fId,actId,this.form.fMblno)
+              this.$refs.ApprovalComments.init(form.fId,actId,status,this.form.fMblno)
             } else if (this.form.moneyStatus != null && this.form.moneyStatus < 6) {
               actId = '460'
-              this.$refs.ApprovalComments.init(form.fId, actId)
+              this.$refs.ApprovalComments.init(form.fId,status,actId)
             } else {
               actId = '420'
-              this.$refs.ApprovalComments.init(form.fId, actId)
+              this.$refs.ApprovalComments.init(form.fId, status,actId)
             }
           })
         } else {
@@ -1950,7 +1951,7 @@ export default {
       this.cancelTwo()
     },
 
-    addOrUpdateHandle() {
+    addOrUpdateHandle(status) {
       this.addOrUpdateVisible = true
       let id = '448'
       let actId = ''
@@ -1962,7 +1963,7 @@ export default {
         actId = '420'
       }
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.form.fId, actId)
+        this.$refs.addOrUpdate.init(this.form.fId, actId,status)
       })
     },
     handleSelect() {

src/views/startApproval.vue

@@ -6,33 +6,44 @@
     :visible.sync="visible"
     :append-to-body="true"
     :modal="false"
-    width="55%">
+    width="55%"
+  >
     <el-form v-model="dataForm" :inline="true">
       <div class="form-group dialog">
         <el-form-item class="full" label="审批意见" prop="auditMsg">
-          <el-input type="textarea" placeholder="审批意见" v-model="dataForm.auditMsg"></el-input>
+          <el-input
+            type="textarea"
+            placeholder="审批意见"
+            v-model="dataForm.auditMsg"
+          ></el-input>
         </el-form-item>
         <el-form-item label="审批人" class="full" prop="auditUserId">
-          <el-select v-model="dataForm.auditUserId" disabled placeholder="审批人" style="width: 100%;">
+          <el-select
+            v-model="dataForm.auditUserId"
+            disabled
+            placeholder="审批人"
+            style="width: 100%"
+          >
             <el-option
               v-for="item in optionsBranch"
               :key="item.userId"
               :label="item.userName"
-              :value="item.userId">
+              :value="item.userId"
+            >
             </el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item disabled label="审批日期">
-                <el-date-picker
-                  v-model="dataForm.auditItem"
-                  size="large"
-                  type="date"
-                  value-format="timestamp"
-                  placeholder="审批日期"
-                >
-                </el-date-picker>
-              </el-form-item>
+          <el-date-picker
+            v-model="dataForm.auditItem"
+            size="large"
+            type="date"
+            value-format="timestamp"
+            placeholder="审批日期"
+          >
+          </el-date-picker>
+        </el-form-item>
       </div>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -44,149 +55,155 @@
 </template>
 
 <script>
-import { listCharge, addMblno} from '@/api/system/startApproval'
-import { queryUserVal } from '@/api/warehouseBusiness/agreement'
-import Global from '@/layout/components/global'
-  export default {
-    name: 'startApproval',
-    data () {
-      return {
-        numData:{
-          fId:null,
-          fMblno:null,
-        },
-        dataForm: {
-          id: null,
-          actId: null,
-          auditMsg: null,
-          auditUserId: null,
-          auditItem: null,
-          refno3:null
-        },
-        visible: false,
-        optionsBranch: []
+import { listCharge, addMblno } from "@/api/system/startApproval";
+import { queryUserVal } from "@/api/warehouseBusiness/agreement";
+import Global from "@/layout/components/global";
+export default {
+  name: "startApproval",
+  data() {
+    return {
+      numData: {
+        fId: null,
+        fMblno: null,
+      },
+      dataForm: {
+        id: null,
+        actId: null,
+        auditMsg: null,
+        auditUserId: null,
+        auditItem: null,
+        refno3: null,
+      },
+      visible: false,
+      optionsBranch: [],
+    };
+  },
+  components: {},
+  methods: {
+    // changefMblno(fId,fMblno){
+    //   console.log(fId,fMblno)
+    //   this.numData.fId = fId
+    //   this.numData.fMblno = fMblno
+    // },
+    init(id, status, actId, fMblno) {
+      this.optionsBranch = [];
+      // 默认录入人
+      queryUserVal().then((response) => {
+        this.dataForm.auditUserId = response.user.userId;
+        this.optionsBranch.push(response.user);
+      });
+      this.visible = true;
+      if (typeof id === "undefined" || typeof actId === "undefined") {
+        this.$message.error("未检测到对应信息，请选择");
+        return false;
       }
+      this.dataForm.id = id;
+      this.dataForm.billId = id;
+      this.dataForm.actId = actId;
+      this.dataForm.fidStatus = status;
+      if (fMblno) {
+        this.dataForm.refno3 = fMblno;
+      }
+      this.$set(this.dataForm, "auditItem", Date.parse(new Date()));
     },
-    components: {
+    getTime() {
+      var date = new Date(this.dataForm.auditItem);
+      var y = date.getFullYear();
+      var m =
+        date.getMonth() + 1 < 10
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1;
+      var d = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      this.$set(this.dataForm, "auditItem", y + "-" + m + "-" + d);
     },
-    methods: {
-      // changefMblno(fId,fMblno){
-      //   console.log(fId,fMblno)
-      //   this.numData.fId = fId
-      //   this.numData.fMblno = fMblno
-      // },
-      init (id,actId,fMblno) {
-        this.optionsBranch = []
-        // 默认录入人
-        queryUserVal().then((response)=>{
-          this.dataForm.auditUserId = response.user.userId
-          this.optionsBranch.push(response.user)
+    approved() {
+      this.$confirm(`是否通过审批?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.getTime();
+          return listCharge(this.dataForm, "/warehouse/paths/approved");
         })
-        this.visible = true
-        if (typeof id === 'undefined' || typeof actId === 'undefined') {
-          this.$message.error('未检测到对应信息，请选择')
-          return false
-        }
-        this.dataForm.id = id
-        this.dataForm.billId = id
-        this.dataForm.actId = actId
-        if(fMblno){
-          this.dataForm.refno3 = fMblno
-        }
-        this.$set(this.dataForm, 'auditItem', Date.parse(new Date()))
-      },
-      getTime(){
-        var date = new Date(this.dataForm.auditItem)
-        var y = date.getFullYear()
-        var m = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
-        var d = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate())
-        this.$set(this.dataForm, 'auditItem', y + '-' + m + '-' + d)
-      },
-      approved () {
-        this.$confirm(`是否通过审批?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.getTime()
-          return  listCharge(this.dataForm,'/warehouse/paths/approved')
-          }).then(data => {
-            if (data && data.code == 200) {
-              this.$message({
-                message: '审核通过',
-                type: 'success',
-                duration: 600,
-                onClose: () => {
-                  this.closeDia()
-                }
-              })
-              this.visible = true
-              // this.homePage()
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-      },
-      // homePage(){
-      //   let view = {
-      //     fullPath: "/finance/charge",
-      //     hash: "",
-      //     matched: Array(2),
-      //     meta: Object,
-      //     name: "Charge",
-      //     params: Object,
-      //     path: "/finance/charge",
-      //     query: Object,
-      //     title: "收费"
-      //   }
-      //   this.$router.push({ path: '/index'})
-      //   this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-      //     if (this.isActive(view)) {
-      //       this.toLastView(visitedViews, view)
-      //     }
-      //   })
-      //   Global.$emit("removeCache", "closeSelectedTag", view);
-      // },
-      approvalRejected () {
-        this.$confirm(`是否驳回审批?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.dataForm.createTime = ''
-          return listCharge(this.dataForm,'/warehouse/paths/approvalRejected')
-          }).then(data => {
+        .then((data) => {
           if (data && data.code == 200) {
-              this.$message({
-                message: '驳回审批',
-                type: 'success',
-                duration: 600,
-                // onClose: () => {
-                //   this.closeDia()
-                // }
-              })
-              this.visible = true
-              this.closeDia()
-              // this.homePage()
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-      },
-      closeDialog (done) {
-        this.visible = false
-        this.$emit('returnApproval', this.dataForm.id, false)
-        Object.assign(this.$data, this.$options.data.call(this))
-      },
-      closeDia () {
-        this.visible = false
-        this.$emit('refreshDataList', this.dataForm.id, false)
-        Object.assign(this.$data, this.$options.data.call(this))
-      }
-    }
-  }
+            this.$message({
+              message: "审核通过",
+              type: "success",
+              duration: 600,
+              onClose: () => {
+                this.closeDia();
+              },
+            });
+            this.visible = true;
+            // this.homePage()
+          } else {
+            this.$message.error(data.msg);
+          }
+        });
+    },
+    // homePage(){
+    //   let view = {
+    //     fullPath: "/finance/charge",
+    //     hash: "",
+    //     matched: Array(2),
+    //     meta: Object,
+    //     name: "Charge",
+    //     params: Object,
+    //     path: "/finance/charge",
+    //     query: Object,
+    //     title: "收费"
+    //   }
+    //   this.$router.push({ path: '/index'})
+    //   this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+    //     if (this.isActive(view)) {
+    //       this.toLastView(visitedViews, view)
+    //     }
+    //   })
+    //   Global.$emit("removeCache", "closeSelectedTag", view);
+    // },
+    approvalRejected() {
+      this.$confirm(`是否驳回审批?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.dataForm.createTime = "";
+          return listCharge(this.dataForm, "/warehouse/paths/approvalRejected");
+        })
+        .then((data) => {
+          if (data && data.code == 200) {
+            this.$message({
+              message: "驳回审批",
+              type: "success",
+              duration: 600,
+              // onClose: () => {
+              //   this.closeDia()
+              // }
+            });
+            this.visible = true;
+            this.closeDia();
+            // this.homePage()
+          } else {
+            this.$message.error(data.msg);
+          }
+        });
+    },
+    closeDialog(done) {
+      this.visible = false;
+      this.$emit("returnApproval", this.dataForm.id, false);
+      Object.assign(this.$data, this.$options.data.call(this));
+    },
+    closeDia() {
+      this.visible = false;
+      this.$emit("refreshDataList", this.dataForm.id, false);
+      Object.assign(this.$data, this.$options.data.call(this));
+    },
+  },
+};
 </script>
 
 <style scoped>
-
 </style>

src/views/viewApproval.vue

@@ -7,13 +7,13 @@
     :modal="false"
     width="75%"
   >
-    <el-table :data="auditList" tooltip-effect="dark" stripe style="width: 100%; margin-bottom: 20px">
-      <el-table-column
-        prop="levelId"
-        width="80"
-        label="序号"
-        type="index"
-      >
+    <el-table
+      :data="auditList"
+      tooltip-effect="dark"
+      stripe
+      style="width: 100%; margin-bottom: 20px"
+    >
+      <el-table-column prop="levelId" width="80" label="序号" type="index">
       </el-table-column>
       <el-table-column
         prop="nickName"
@@ -53,8 +53,10 @@
         label="审核时间"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.auditItem !== undefined">{{ scope.row.auditItem.slice(0,10)}}</span>
-          <span v-else>{{scope.row.auditItem}}</span>
+          <span v-if="scope.row.auditItem !== undefined">{{
+            scope.row.auditItem.slice(0, 10)
+          }}</span>
+          <span v-else>{{ scope.row.auditItem }}</span>
         </template>
       </el-table-column>
 
@@ -66,8 +68,10 @@
         label="提交时间"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.auditOpTime !== undefined">{{ scope.row.auditOpTime.slice(0,10)}}</span>
-          <span v-else>{{scope.row.auditOpTime}}</span>
+          <span v-if="scope.row.auditOpTime !== undefined">{{
+            scope.row.auditOpTime.slice(0, 10)
+          }}</span>
+          <span v-else>{{ scope.row.auditOpTime }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -78,53 +82,52 @@
 </template>
 
 <script>
-import { listCharge } from '@/api/system/viewApproval'
+import { listCharge } from "@/api/system/viewApproval";
 
 export default {
   data() {
     return {
       visible: false,
-      auditList:[]
-    }
+      auditList: [],
+    };
   },
   methods: {
-    init(id,actId) {
-      if (id && actId){
+    init(id, actId, status) {
+      if (id && actId) {
         let data = {
-          id:id,
-          actId:actId
-        }
-        this.optionsUsers = []
-        this.visible = true
-        this.addCharge(data)
-      }else {
-        if(!id){
-          this.$message.error('主表ID为空');
-        }else {
-          this.$message.error('活动ID为空');
+          id: id,
+          actId: actId,
+          fidStatus: status,
+        };
+        this.optionsUsers = [];
+        this.visible = true;
+        this.addCharge(data);
+      } else {
+        if (!id) {
+          this.$message.error("主表ID为空");
+        } else {
+          this.$message.error("活动ID为空");
         }
       }
     },
     addCharge(data) {
-      listCharge(data).then(data => {
-        console.log(data)
-        this.auditList = data.data
-      })
+      listCharge(data).then((data) => {
+        console.log(data);
+        this.auditList = data.data;
+      });
     },
     // 表单提交
-    dataFormSubmit() {
-
-    },
+    dataFormSubmit() {},
     closeDialog(done) {
-      this.visible = false
-      this.$emit('refreshDataList')
-      Object.assign(this.$data, this.$options.data.call(this))
+      this.visible = false;
+      this.$emit("refreshDataList");
+      Object.assign(this.$data, this.$options.data.call(this));
     },
     closeDia() {
-      this.visible = false
-      this.$emit('refreshDataList')
-      Object.assign(this.$data, this.$options.data.call(this))
-    }
-  }
-}
+      this.visible = false;
+      this.$emit("refreshDataList");
+      Object.assign(this.$data, this.$options.data.call(this));
+    },
+  },
+};
 </script>

src/views/warehouseBusiness/agreement/index.vue

@@ -427,9 +427,9 @@
       <div slot="footer" class="dialog-footer">
         <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
         <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
-        <el-button v-if="approve === true" @click="goApproval">审批</el-button>
-        <el-button type="danger" @click="backApproval" v-if="form.fBillstatus === '4' && operator === lander">撤销审批</el-button>
-        <el-button type="info" v-if="form.fBillstatus >= 3" @click="addOrUpdateHandle()">查看审批流</el-button>
+        <el-button v-if="approve === true" @click="goApproval('f_billstatus')">审批</el-button>
+        <el-button type="danger" @click="backApproval('f_billstatus')" v-if="form.fBillstatus === '4' && operator === lander">撤销审批</el-button>
+        <el-button type="info" v-if="form.fBillstatus >= 3" @click="addOrUpdateHandle('f_billstatus')">查看审批流</el-button>
         <el-button type="success" @click="backrRconciliation" v-if="form.fBillstatus === '6'">撤销请核</el-button>
         <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
@@ -728,10 +728,10 @@ export default {
         })
       }
     },
-    goApproval(){
+    goApproval(status){
       this.addOrUpdateVisib = true
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(this.form.fId,this.agreementId)
+        this.$refs.ApprovalComments.init(this.form.fId,status,this.agreementId)
       })
     },
     returnData(){
@@ -744,13 +744,13 @@ export default {
       this.addOrUpdateVisible = false
     },
     // 查看审批流
-    addOrUpdateHandle() {
+    addOrUpdateHandle(status) {
       this.addOrUpdateVisible = true
       this.addOrUpdateVisib = false
       let id = '448'
       let actId = '110'
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.form.fId, this.agreementId)
+        this.$refs.addOrUpdate.init(this.form.fId, this.agreementId,status)
       })
     },
     register() {
@@ -809,11 +809,12 @@ export default {
       this.open = true
     },
     //撤销审批
-    backApproval() {
+    backApproval(status) {
       let data = {
         id: this.form.fId,
         actId: this.agreementId,
-        billId: this.form.fId
+        billId: this.form.fId,
+        fidStatus: status,
       }
       RevocationApproval(data).then(data => {
         if (data.code === 200) {

src/views/warehouseBusiness/inStock/index.vue

@@ -2705,7 +2705,7 @@
                 <!-- <el-button size="small">审核费用</el-button> -->
                 <el-button
                   @click.native.prevent="
-                    deleteRow(scope.$index, warehouseCrList)
+                    deleteRoww(scope.$index, warehouseCrList)
                   "
                   size="small"
                   :disabled="browseStatus"
@@ -5831,6 +5831,9 @@ export default {
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },
+    deleteRoww(index, rows) {
+      rows.splice(index, 1);
+    },
     // 付款选择
     Paymentoptions(selection) {},
     /** 新增按钮操作 */

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -988,11 +988,11 @@
 <!--      </div>-->
       <div slot="footer" class="dialog-footer">
         <el-button type="success" v-if="form.fBillstatus === 6" @click="backrRconciliation">撤销请核</el-button>
-        <el-button v-if="approve === true" @click="goApproval">审批</el-button>
-        <el-button type="primary" v-if="form.fBillstatus > 3" @click="addOrUpdateHandle">查看审批流</el-button>
+        <el-button v-if="approve === true" @click="goApproval('f_billstatus')">审批</el-button>
+        <el-button type="primary" v-if="form.fBillstatus > 3" @click="addOrUpdateHandle('f_billstatus')">查看审批流</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
         <el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
-        <el-button type="danger" :disabled="disappear" v-if="form.fBillstatus === '4' && Operator === Lander" @click="backApproval">撤销审批</el-button>
+        <el-button type="danger" :disabled="disappear" v-if="form.fBillstatus === '4' && Operator === Lander" @click="backApproval('f_billstatus')">撤销审批</el-button>
         <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
         <el-button
           :disabled="browseStatus"
@@ -1503,10 +1503,10 @@
         }
       },
       // 审批按钮
-      goApproval(){
+      goApproval(status){
         this.addOrUpdateVisib = true
         this.$nextTick(() => {
-          this.$refs.ApprovalComments.init(this.form.fId,this.actId)
+          this.$refs.ApprovalComments.init(this.form.fId,status,this.actId)
         })
       },
       homePage(){
@@ -1531,13 +1531,13 @@
         Global.$emit("removeCache", "closeSelectedTag", view);
       },
       // 查看审批流
-      addOrUpdateHandle(){
+      addOrUpdateHandle(status){
         this.addOrUpdateVisible = true
         this.addOrUpdateVisib = false
         let id = '448'
         let actId = '110'
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(this.form.fId,this.actId)
+          this.$refs.addOrUpdate.init(this.form.fId,this.actId,status)
         })
       },
       returnData(){