Merge branch 'test' of git.echepei.com:zhujiawei/Warehouse_management_ui

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,21 @@ export function detailStock(query) {
     params: query
   })
 }
+
+//主表审核
+export function submitWarehousingApproval(data) {
+  return request({
+    url: '/warehouseBusiness/inStock/submitWarehousingApproval',
+    method: 'post',
+    data: data
+  })
+}
+
+//删除前的判断2
+export function checkCode(query) {
+  return request({
+    url: '/warehouseBusiness/inStock/checkCode',
+    method: 'get',
+    params: query
+  })
+}

src/api/warehouseBusiness/warehouseOutStock.js

@@ -124,3 +124,27 @@ export function delOutStock_s(fId) {
     method: 'delete'
   })
 }
+
+// 接单撤销(请核)
+export function ordersRevoke(fId) {
+  return request({
+    url: '/warehouseBusiness/outStock/withdrawOrdersById/' + fId,
+    method: 'get',
+  })
+}
+//主表审核
+export function submitWarehousingApproval(data) {
+  return request({
+    url: '/warehouseBusiness/outStock/submitWarehousingApproval',
+    method: 'post',
+    data: data
+  })
+}
+//删除前的判断2
+export function checkCode(query) {
+  return request({
+    url: '/warehouseBusiness/inStock/checkCode',
+    method: 'get',
+    params: query
+  })
+}

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/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,14 @@
         </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 +941,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() {
@@ -963,7 +967,11 @@ export default {
           fCorpid: "", //结算单位ID
         };
         getAgreement(this.approval.billId).then((response) => {
-          this.deptName = response.data.dept.deptName;
+          if (response.data.dept) {
+            this.deptName = response.data.dept.deptName
+              ? response.data.dept.deptName
+              : null;
+          }
           this.form = response.data.tWarehouseAgreement;
           this.$set(this.form, "fEnddate", Date.parse(this.form.fEnddate));
           this.$set(this.form, "fBegindate", Date.parse(this.form.fBegindate));
@@ -981,13 +989,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() {
@@ -1043,7 +1051,11 @@ export default {
             "YYYY-MM-DD HH:mm:ss"
           ),
         });
-        this.deptName = response.dept.deptName;
+        if (response.dept) {
+          this.deptName = response.dept.deptName
+            ? response.dept.deptName
+            : null;
+        }
         this.form.fDeptid = response.dept.deptId;
         this.agreementitemsList.createBy = response.user.userName;
       });
@@ -1056,7 +1068,11 @@ export default {
       this.approvalProhibit = false;
       const fId = row.fId || this.ids;
       getAgreement(fId).then((response) => {
-        this.deptName = response.data.dept.deptName;
+        if (response.data.dept) {
+          this.deptName = response.data.dept.deptName
+            ? response.data.dept.deptName
+            : null;
+        }
         this.form = response.data.tWarehouseAgreement;
         this.$set(this.form, "fTaskType", this.form.fTaskType + "");
         this.$set(this.form, "fEnddate", Date.parse(this.form.fEnddate));
@@ -1091,7 +1107,11 @@ export default {
       this.approvalProhibit = false;
       const fId = row.fId || this.ids;
       getAgreement(fId).then((response) => {
-        this.deptName = response.data.dept.deptName;
+        if (response.data.dept) {
+          this.deptName = response.data.dept.deptName
+            ? response.data.dept.deptName
+            : null;
+        }
         this.form = response.data.tWarehouseAgreement;
         this.$set(this.form, "fEnddate", Date.parse(this.form.fEnddate));
         this.$set(this.form, "fBegindate", Date.parse(this.form.fBegindate));
@@ -1109,11 +1129,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) {
@@ -1339,8 +1360,12 @@ export default {
         fDc: "D",
       };
       queryUserVal().then((response) => {
-        this.deptName = response.dept.deptName;
-        this.form.fDeptid = response.dept.deptId;
+        if (response.dept) {
+          this.deptName = response.dept.deptName
+            ? response.dept.deptName
+            : null;
+        }
+        this.form.fDeptid = response.dept.deptId ? response.dept.deptId : null;
       });
     },
     /** 修改按钮操作 */
@@ -1349,7 +1374,11 @@ export default {
         console.log("111");
         getAgreement(this.idCopy).then((response) => {
           this.register();
-          this.deptName = response.data.dept.deptName;
+          if (response.data.dept) {
+            this.deptName = response.data.dept.deptName
+              ? response.data.dept.deptName
+              : null;
+          }
           this.form = response.data.tWarehouseAgreement;
           this.form.fId = null;
           this.form.fBillstatus = "";
@@ -1384,7 +1413,11 @@ export default {
         const fId = row.fId || this.ids;
         getAgreement(fId).then((response) => {
           this.register();
-          this.deptName = response.data.dept.deptName;
+          if (response.data.dept) {
+            this.deptName = response.data.dept.deptName
+              ? response.data.dept.deptName
+              : null;
+          }
           this.form = response.data.tWarehouseAgreement;
           this.$set(this.form, "fTaskType", this.form.fTaskType + "");
           this.$set(this.form, "fEnddate", Date.parse(this.form.fEnddate));

src/views/basicdata/corps/index.vue

@@ -127,11 +127,11 @@
         >
       </el-col>
       <div class="tabSetting">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-         <div style="margin: 0 12px">
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
           <el-tooltip
             class="item"
             effect="dark"
@@ -206,7 +206,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-           <el-table-column
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -436,247 +436,259 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="传真" prop="fFax">
-              <el-input
-                v-model="form.fFax"
-                style="width: 250px"
-                placeholder="请输入传真"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="邮箱" prop="fEmail">
-              <el-input
-                v-model="form.fEmail"
-                style="width: 250px"
-                placeholder="请输入邮箱"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="联系人" prop="fManage">
-              <el-input
-                v-model="form.fManage"
-                style="width: 250px"
-                placeholder="请输入联系人"
-              />
-            </el-form-item>
-          </el-col>
+          <div style="display: flex; justify-content: flex-end">
+            <el-button @click="showForm = !showForm"
+              >{{ showForm ? "隐藏" : "更多" }}
+            </el-button>
+          </div>
         </el-row>
+        <div v-if="showForm">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="传真" prop="fFax">
+                <el-input
+                  v-model="form.fFax"
+                  style="width: 250px"
+                  placeholder="请输入传真"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="邮箱" prop="fEmail">
+                <el-input
+                  v-model="form.fEmail"
+                  style="width: 250px"
+                  placeholder="请输入邮箱"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="联系人" prop="fManage">
+                <el-input
+                  v-model="form.fManage"
+                  style="width: 250px"
+                  placeholder="请输入联系人"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="地址" prop="fAddr">
-              <el-input
-                v-model="form.fAddr"
-                style="width: 250px"
-                placeholder="请输入地址"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="英文地址" prop="fEaddr">
-              <el-input
-                v-model="form.fEaddr"
-                style="width: 250px"
-                placeholder="请输入英文地址"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="规模" prop="fScale">
-              <el-input
-                v-model="form.fScale"
-                style="width: 250px"
-                placeholder="请输入规模"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="地址" prop="fAddr">
+                <el-input
+                  v-model="form.fAddr"
+                  style="width: 250px"
+                  placeholder="请输入地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="英文地址" prop="fEaddr">
+                <el-input
+                  v-model="form.fEaddr"
+                  style="width: 250px"
+                  placeholder="请输入英文地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="规模" prop="fScale">
+                <el-input
+                  v-model="form.fScale"
+                  style="width: 250px"
+                  placeholder="请输入规模"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="省" prop="fProvince">
-              <el-input
-                v-model="form.fProvince"
-                style="width: 250px"
-                placeholder="请输入省"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="市" prop="fCity">
-              <el-input
-                v-model="form.fCity"
-                style="width: 250px"
-                placeholder="请输入市"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="结算方式" prop="fStltypeid">
-              <el-select
-                v-model="form.fStltypeid"
-                style="width: 250px"
-                placeholder="请选择结算表票结、月结"
-              >
-                <el-option
-                  v-for="dict in fStltypeidOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="parseInt(dict.dictValue)"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="省" prop="fProvince">
+                <el-input
+                  v-model="form.fProvince"
+                  style="width: 250px"
+                  placeholder="请输入省"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="市" prop="fCity">
+                <el-input
+                  v-model="form.fCity"
+                  style="width: 250px"
+                  placeholder="请输入市"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="结算方式" prop="fStltypeid">
+                <el-select
+                  v-model="form.fStltypeid"
+                  style="width: 250px"
+                  placeholder="请选择结算表票结、月结"
+                >
+                  <el-option
+                    v-for="dict in fStltypeidOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="parseInt(dict.dictValue)"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="结费天数" prop="fStldays">
-              <el-input
-                v-model="form.fStldays"
-                style="width: 250px"
-                placeholder="请输入结费天数"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="合同号" prop="fContractno">
-              <el-input
-                v-model="form.fContractno"
-                style="width: 250px"
-                placeholder="请输入合同号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="税号" prop="fTax">
-              <el-input
-                v-model="form.fTax"
-                style="width: 250px"
-                placeholder="请输入税号"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="结费天数" prop="fStldays">
+                <el-input
+                  v-model="form.fStldays"
+                  style="width: 250px"
+                  placeholder="请输入结费天数"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="合同号" prop="fContractno">
+                <el-input
+                  v-model="form.fContractno"
+                  style="width: 250px"
+                  placeholder="请输入合同号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="税号" prop="fTax">
+                <el-input
+                  v-model="form.fTax"
+                  style="width: 250px"
+                  placeholder="请输入税号"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="合同起" prop="fContractb">
-              <el-date-picker
-                clearable
-                size="small"
-                style="width: 250px"
-                v-model="form.fContractb"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择合同起"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="合同至" prop="fContracte">
-              <el-date-picker
-                clearable
-                size="small"
-                style="width: 250px"
-                v-model="form.fContracte"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择合同至"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="开票电话" prop="fInvtel">
-              <el-input
-                v-model="form.fInvtel"
-                style="width: 250px"
-                placeholder="请输入开票电话"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="合同起" prop="fContractb">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  style="width: 250px"
+                  v-model="form.fContractb"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择合同起"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="合同至" prop="fContracte">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  style="width: 250px"
+                  v-model="form.fContracte"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择合同至"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="开票电话" prop="fInvtel">
+                <el-input
+                  v-model="form.fInvtel"
+                  style="width: 250px"
+                  placeholder="请输入开票电话"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="开票地址" prop="fInvaddr">
-              <el-input
-                v-model="form.fInvaddr"
-                style="width: 250px"
-                placeholder="请输入开票地址"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="本位币账号" prop="fBankno" label-width="100">
-              <el-input
-                v-model="form.fBankno"
-                style="width: 250px"
-                placeholder="请输入本位币账号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="本位币银行" label-width="100" prop="fBankname">
-              <el-input
-                v-model="form.fBankname"
-                style="width: 250px"
-                placeholder="请输入本位币银行"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="开票地址" prop="fInvaddr">
+                <el-input
+                  v-model="form.fInvaddr"
+                  style="width: 250px"
+                  placeholder="请输入开票地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="本位币账号" prop="fBankno" label-width="100">
+                <el-input
+                  v-model="form.fBankno"
+                  style="width: 250px"
+                  placeholder="请输入本位币账号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item
+                label="本位币银行"
+                label-width="100"
+                prop="fBankname"
+              >
+                <el-input
+                  v-model="form.fBankname"
+                  style="width: 250px"
+                  placeholder="请输入本位币银行"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="外币账号" prop="fUbankno">
-              <el-input
-                v-model="form.fUbankno"
-                style="width: 250px"
-                placeholder="请输入外币账号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="外币银行" prop="fUbankname">
-              <el-input
-                v-model="form.fUbankname"
-                style="width: 250px"
-                placeholder="请输入外币银行"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="状态">
-              <!--<el-radio-group v-model="form.fStatus">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="外币账号" prop="fUbankno">
+                <el-input
+                  v-model="form.fUbankno"
+                  style="width: 250px"
+                  placeholder="请输入外币账号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="外币银行" prop="fUbankname">
+                <el-input
+                  v-model="form.fUbankname"
+                  style="width: 250px"
+                  placeholder="请输入外币银行"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="状态">
+                <!--<el-radio-group v-model="form.fStatus">
                 <el-radio label="1">请选择字典生成</el-radio>
               </el-radio-group>-->
-              <el-radio-group v-model="form.fStatus">
-                <el-radio
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                  >{{ dict.dictLabel }}</el-radio
-                >
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
+                <el-radio-group v-model="form.fStatus">
+                  <el-radio
+                    v-for="dict in statusOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictValue"
+                    >{{ dict.dictLabel }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="form.remark"
-            style="width: 400px"
-            placeholder="请输入备注"
-          />
-        </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              style="width: 400px"
+              placeholder="请输入备注"
+            />
+          </el-form-item>
+        </div>
       </el-form>
       <div>
         <el-row :gutter="10" class="mb8">
@@ -845,7 +857,7 @@ Vue.directive("dialogDrag", {
 
 export default {
   name: "Corps",
-  components: {draggable},
+  components: { draggable },
   data() {
     return {
       disCorps: false,
@@ -1012,10 +1024,11 @@ export default {
         },
       ],
       allCheck: false,
+      showForm: false,
     };
   },
   created() {
-      this.setRowList = this.tableDate;
+    this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.getList();
     this.getDicts("data_customer_category").then((response) => {
@@ -1283,7 +1296,7 @@ export default {
               0,
               this.form.fTypename.length - 1
             );
-            if(this.contactList.length==0&&Cookies.get("sysType") == 2){
+            if (this.contactList.length == 0 && Cookies.get("sysType") == 2) {
               return this.$message.error("联系人不能为空");
             }
             formDate.append("corps", JSON.stringify(this.form));
@@ -1314,7 +1327,7 @@ export default {
               0,
               this.form.fTypename.length - 1
             );
-            if(this.contactList.length==0&&Cookies.get("sysType") == 2){
+            if (this.contactList.length == 0 && Cookies.get("sysType") == 2) {
               return this.$message.error("联系人不能为空");
             }
             formDate.append("corps", JSON.stringify(this.form));

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/reportManagement/whgenleg/index.vue

@@ -225,7 +225,6 @@
       show-summary
       :summary-method="getSum"
     >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column
         type="index"
         label="行号"
@@ -233,22 +232,6 @@
         width="100"
         fixed
       />
-      <!-- <el-table-column
-        label="提单号"
-        sortable
-        align="center"
-        fixed
-        :show-overflow-tooltip="true"
-        width="100"
-      >
-        <template slot-scope="scope">
-          <div @click="goDetail(scope.row)">
-            <el-link type="primary" :underline="false">{{
-              scope.row.fMblno
-            }}</el-link>
-          </div>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
@@ -271,155 +254,6 @@
           <span v-else>{{ scope.row[item.label] }}</span>
         </template>
       </el-table-column>
-      <!-- </el-table-column>
-      <el-table-column
-        label="客户"
-        sortable
-        align="center"
-        prop="fCorpid"
-        fixed
-        width="220"
-      />
-      <el-table-column
-        label="入库日期"
-        sortable
-        align="center"
-        prop="fReviewDate"
-        fixed
-        width="120"
-      >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.fOriginalbilldate, "{y}-{m}-{d}")
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="仓储费计算日期"
-        sortable
-        align="center"
-        prop="fChargedate"
-        fixed
-        width="140"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fChargedate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="货物属性"
-        align="center"
-        prop="fBusinessTypes"
-        width="120"
-      />
-      <el-table-column
-        label="属性详情"
-        align="center"
-        prop="fMarks"
-        width="120"
-      />
-      <el-table-column
-        label="品名"
-        align="center"
-        prop="fGoodsids"
-        width="120"
-      />
-      <el-table-column
-        label="仓库"
-        sortable
-        align="center"
-        prop="fWarehouseids"
-        width="120"
-      />
-      <el-table-column
-        label="贸易方式"
-        sortable
-        align="center"
-        prop="fTrademodeid"
-        width="120"
-      /> -->
-      <!--      <el-table-column
-        label="贸易方式"
-        align="center"
-        prop="fTrademodeid"
-        :formatter="fTrademodeidFormat"
-        width="120"
-      />-->
-      <!-- <el-table-column
-        label="入库件数"
-        align="center"
-        prop="fQtyD"
-        width="120"
-      /> -->
-      <!--      <el-table-column label="入库尺码" align="center" prop="fVolumnD" />-->
-      <!-- <el-table-column
-        label="入库毛重(kg)"
-        align="center"
-        prop="fGrossweightD"
-        width="120"
-      />
-      <el-table-column
-        label="入库净重(kg)"
-        align="center"
-        prop="fNetweightD"
-        width="120" -->
-      <!--      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />-->
-      <!-- <el-table-column
-        label="出库件数"
-        align="center"
-        prop="fQtyC"
-        width="120"
-      />
-      <el-table-column
-        label="出库毛重(kg)"
-        align="center"
-        prop="fGrossweightC"
-        width="120"
-      />
-      <el-table-column
-        label="出库净重(kg)"
-        align="center"
-        prop="fNetweightC"
-        width="120"
-      />
-      <el-table-column
-        label="结余件数"
-        align="center"
-        prop="fQtyblc"
-        width="120"
-      />
-      <el-table-column
-        label="结余毛重(kg)"
-        align="center"
-        prop="fGrossweightblc"
-        width="120"
-      />
-      <el-table-column
-        label="结余净重(kg)"
-        align="center"
-        prop="fNetweightblc"
-        width="120"
-      />
-      <el-table-column label="箱号" align="center" prop="fCntrno" width="120" />
-      <el-table-column label="备注" align="center" prop="remark" width="120" /> -->
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['warehouseBusiness:whgenleg:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouseBusiness:whgenleg:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -865,19 +699,36 @@ export default {
     getSum(param) {
       const { columns, data } = param;
       const sums = [];
+      var values = [];
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = "总计";
-        } else if (
-          index === 13 ||
-          index === 10 ||
-          index === 11 ||
-          index === 12 ||
-          index === 14 ||
-          index === 15 ||
-          index === 16 ||
-          index === 17 ||
-          index === 18
+        }
+        if (column.property === "fGrossweightD") {
+          values = data.map((item) => Number(item["fGrossweightD"]));
+        }
+        if (column.property === "fNetweightD") {
+          values = data.map((item) => Number(item["fNetweightD"]));
+        }
+        if (column.property === "fQtyD") {
+          values = data.map((item) => Number(item["fQtyD"]));
+        }
+                if (column.property === "fGrossweightC") {
+          values = data.map((item) => Number(item["fGrossweightC"]));
+        }
+        if (column.property === "fNetweightC") {
+          values = data.map((item) => Number(item["fNetweightC"]));
+        }
+        if (column.property === "fQtyC") {
+          values = data.map((item) => Number(item["fQtyC"]));
+        }
+        if (
+          column.property === "fGrossweightD" ||
+          column.property === "fNetweightD" ||
+          column.property === "fQtyD" ||
+          column.property === "fGrossweightC" ||
+          column.property === "fNetweightC" ||
+          column.property === "fQtyC"
         ) {
           const values = data.map((item) => Number(item[column.property]));
           if (!values.every((value) => isNaN(value))) {
@@ -889,15 +740,23 @@ export default {
                 return prev;
               }
             }, 0);
-            if (
-              index === 11 ||
-              index === 12 ||
-              index === 14 ||
-              index === 15 ||
-              index === 17 ||
-              index === 18
-            ) {
-              sums[index] = (sums[index] / 1000).toFixed(2) + "(吨)";
+            if (column.property === "fGrossweightD") {
+              sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            }
+            if (column.property === "fNetweightD") {
+              sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            }
+            if (column.property === "fQtyD") {
+              sums[index] = sums[index].toFixed(2);
+            }
+                 if (column.property === "fGrossweightC") {
+              sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            }
+            if (column.property === "fNetweightC") {
+              sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            }
+            if (column.property === "fQtyC") {
+              sums[index] = sums[index].toFixed(2);
             }
           }
         }

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

@@ -504,7 +504,7 @@
       </el-form>
       <div style="font-size:18px; padding-top:8px">
         计费物资明细
-        <el-button :disabled="browseStatus||countstate" @click="calculateCost">{{countstate == false?'计算仓储费':'计算中'}}</el-button>
+        <el-button :disabled="browseStatus" @click="calculateCost">计算仓储费</el-button>
         <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
         <el-button
           type="warning"
@@ -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"
@@ -1326,7 +1326,8 @@
         // 表单校验
         rules: {
           fCorpid: [{required: true, message: " ", trigger: "blur",}],
-          fBillingDeadline: [{required: true, message: " ", trigger: "blur",}]
+          fBillingDeadline: [{required: true, message: " ", trigger: "blur",}],
+          fGoodsid: [{required: true, message: " ", trigger: "blur",}]
         }
       };
     },
@@ -1503,10 +1504,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 +1532,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(){
@@ -1625,7 +1626,6 @@
       },
       getStorageFee () {
         calculateStorageFees(this.form).then((response) => {
-          console.log(response)
           this.dataList = []
           this.warehouseDrList = []
           this.form.fId = response.data.warehouseBills.fId