修改审批流 校验时间戳

src/api/warehouseBusiness/warehouseInStock.js

@@ -156,3 +156,12 @@ export function submitWarehousingApproval(data) {
     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/agreement/agreementTask/index.vue

@@ -648,10 +648,14 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="approvalProhibit" @click="immediateApproval('f_billstatus')"
+        <el-button
+          v-if="approvalProhibit"
+          @click="immediateApproval('f_billstatus')"
           >审批</el-button
         >
-        <el-button v-if="form.fBillstatus > 2" @click="viewAudit('f_billstatus')"
+        <el-button
+          v-if="form.fBillstatus > 2"
+          @click="viewAudit('f_billstatus')"
           >查看审批</el-button
         >
         <el-button
@@ -940,7 +944,7 @@ export default {
     immediateApproval(status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(this.approval.billId,status, 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));
@@ -987,7 +995,7 @@ export default {
       let id = "448";
       let actId = "110";
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.form.fId, 320,status);
+        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));
@@ -1340,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;
       });
     },
     /** 修改按钮操作 */
@@ -1350,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 = "";
@@ -1385,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/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/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"
@@ -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",}]
         }
       };
     },
@@ -1625,7 +1626,6 @@
       },
       getStorageFee () {
         calculateStorageFees(this.form).then((response) => {
-          console.log(response)
           this.dataList = []
           this.warehouseDrList = []
           this.form.fId = response.data.warehouseBills.fId