仓库费用状态字段修改

src/views/Warehousing/cargoClearance/index.vue

@@ -124,18 +124,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -542,6 +539,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -661,7 +659,7 @@ export default {
         },
         {
           surface: "16",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1051,6 +1049,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/components/incomeMoney.vue

@@ -515,17 +515,19 @@
           <el-button
               @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
               size="small"
-              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              :disabled="scope.row.fBillstatus == 6 || browseStatus"
           >移除
           </el-button>
           <el-button
             size="small"
             @click="listCheck(scope.row)"
             v-if="scope.row.fBillstatus < 6"
+            :disabled="browseStatus"
           >请核</el-button>
           <el-button
             size="small"
             @click="revokeListCheck(scope.row)"
+            :disabled="browseStatus"
             v-if="scope.row.fBillstatus == 6"
           >撤销请核</el-button>
         </template>

src/views/Warehousing/components/payMoney.vue

@@ -377,11 +377,13 @@
             size="small"
             @click="listCheck(scope.row)"
             v-if="scope.row.fBillstatus < 6"
+            :disabled="browseStatus"
           >请核</el-button>
           <el-button
             size="small"
             @click="revokeListCheck(scope.row)"
             v-if="scope.row.fBillstatus == 6"
+            :disabled="browseStatus"
           >撤销请核</el-button>
         </template>
       </el-table-column>

src/views/Warehousing/costModify/AddOrUpdate.vue

@@ -894,14 +894,14 @@ export default {
         fSrcTypeId: 10,
         fBillstatus: null,
         actId: 1000,
-        fBilltype: this.form.fBilltype
+        fBilltype: this.form.fBilltype,
+        fStltypeid: 1,
       }
       console.log(list)
       this.formfeesList.push(list)
     },
     //变更按钮
     change(row){
-      console.log(row)
       let list = JSON.parse(JSON.stringify(row))
       list.fId = ''
       list.fBillstatus = ''

src/views/Warehousing/goodsTransfer/index.vue

@@ -123,18 +123,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="保存" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="审批驳回" value="3"></el-option>
-                    <el-option label="提交审核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="审核完成" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -536,6 +533,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -570,7 +568,7 @@ export default {
         },
         {
           surface: "14",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1071,6 +1069,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -2210,7 +2210,7 @@
             </template>
           </el-table-column>
           <el-table-column
-              prop="fUnitprice"
+              prop="fQty"
               header-align="center"
               align="center"
               width="130px"
@@ -2219,7 +2219,7 @@
             <template slot-scope="scope">
               <el-input
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                  v-model="scope.row.fUnitprice"
+                  v-model="scope.row.fQty"
                   placeholder="数量"
                   :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeContractAmt(scope.row)"
@@ -2228,7 +2228,7 @@
             </template>
           </el-table-column>
           <el-table-column
-              prop="fQty"
+              prop="fUnitprice"
               header-align="center"
               align="center"
               width="130px"
@@ -2237,7 +2237,7 @@
             <template slot-scope="scope">
               <el-input
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                  v-model="scope.row.fQty"
+                  v-model="scope.row.fUnitprice"
                   placeholder="单价"
                   :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeContractAmt(scope.row)"
@@ -5452,6 +5452,90 @@ export default {
       revoke(this.form.fId).then((data) => {
         if (data.code === 200) {
           this.browseStatus = false;
+          getWarehousebills(this.chiId).then((response) => {
+            this.form = response.data.warehousebills;
+            if (this.form.fBillstatus > 3) {
+              this.approvalStatus = false;
+              this.browseStatus = true;
+            } else {
+              this.approvalStatus = true;
+              this.browseStatus = false;
+            }
+            this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
+            this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
+            this.$set(this.form, "createTime", Date.parse(this.form.createTime));
+            this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+            this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
+            this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
+            if (this.form.fCartype || this.form.fCartype == 0) {
+              this.$set(this.form, "fCartype", this.form.fCartype.toString());
+            }
+            if (this.form.fStltypeid || this.form.fStltypeid == 0) {
+              this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
+            }
+            if (this.form.fTrademodeid) {
+              this.$set(
+                this.form,
+                "fTrademodeid",
+                this.form.fTrademodeid.toString()
+              );
+            }
+            if (!this.copyStatus) {
+              if (response.data.warehouseBillsItem) {
+                response.data.warehouseBillsItem.map((e) => {
+                  e.fBsdate = Date.parse(e.fBsdate);
+                  e.fBusinessType = e.fBusinessType.toString();
+                  e.fLntype = e.fLntype ? e.fLntype.toString() : null;
+                });
+                response.data.warehouseBillsItem.forEach(item => {
+                  item.fCntrtype = parseInt(item.fCntrtype)
+                  item.disabled = true
+                })
+                this.detailList1 = response.data.warehouseBillsItem.filter(item=>item.fDc=='D');
+                this.detailList = response.data.warehouseBillsItem.filter(item=>item.fDc=='C');
+              } else {
+                this.detailList = [];
+              }
+              response.data.warehousebillsfeesCr.map((e) => {
+                if (e.fFeeunitid) {
+                  e.fFeeUnitid = e.fFeeunitid.toString();
+                }
+                if (e.fStltypeid || e.fStltypeid == 0) {
+                  e.fStltypeid = e.fStltypeid.toString();
+                }
+              });
+              this.warehouseCrList = response.data.warehousebillsfeesCr;
+              response.data.warehousebillsfeesDr.map((e) => {
+                if (e.fFeeunitid) {
+                  e.fFeeUnitid = e.fFeeunitid.toString();
+                }
+                if (e.fStltypeid || e.fStltypeid == 0) {
+                  e.fStltypeid = e.fStltypeid.toString();
+                }
+              });
+              this.warehouseDrList = response.data.warehousebillsfeesDr;
+              this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
+              if (response.data.tCntrList) {
+                this.CntrTable = response.data.tCntrList;
+              } else {
+                this.CntrTable = [];
+              }
+              if (response.data.enclosures) {
+                this.relevantAttachments = response.data.enclosures;
+              }
+            } else {
+              this.$set(this.form, "fId", null);
+              this.$set(this.form, "fMblno", null);
+              this.$set(this.form, "fMarks", null);
+              this.$set(this.form, "fProductName",null);
+              this.$set(this.form, "fNetweight", 0);
+              this.$set(this.form, "fPlanvolumn", 0);
+              this.$set(this.form, "fGrossweight", 0);
+            }
+            treeselect(this.form.fWarehouseid).then((response) => {
+              this.fWarehouseidOptions = response.data;
+            });
+          });
           this.msgSuccess("撤销成功");
         }
       });
@@ -7510,6 +7594,7 @@ export default {
       if (!row.fFeeUnitid) {
         return false;
       }
+      console.log(row.fFeeUnitid)
       if (row.fFeeUnitid === "2") {
         this.$set(row, "fQty", (this.fGrossweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "1") {

src/views/Warehousing/inAndOutStock/index.vue

@@ -122,18 +122,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -558,6 +555,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus:null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -698,7 +696,7 @@ export default {
         },
         {
           surface: "19",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1010,6 +1008,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/inStock/index.vue

@@ -523,11 +523,6 @@
             </div></el-link
           >
         </span>
-              <span v-else-if="item.label == 'fFeeStatus'">
-                <div v-if="scope.row.fFeeStatus == 1">暂存</div>
-                <div v-else-if="scope.row.fFeeStatus == 2">部分</div>
-                <div v-else>全部入账</div>
-              </span>
               <span v-else>{{ scope.row[item.label] }}</span>
             </template>
           </el-table-column>
@@ -1296,6 +1291,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -2791,7 +2791,7 @@
             </tr>
             <tr>
               <td><span class="no-print">出库日</span></td>
-              <td>{{ Printinglist.length === 1 ? Printinglist[0].fBsdate : '' }}</td>
+              <td>{{ Printinglist.length === 1 ? Printinglist[0].time : '' }}</td>
               <td><span class="no-print">预计到厂日</span></td>
               <td>{{ form.fPredictBranch ? form.fPredictBranch : '' }}</td>
               <td><span class="no-print">等级</span></td>
@@ -4392,6 +4392,12 @@ export default {
     },
   },
   created() {
+    const aaa = new Date(1639440000000)
+    const year = aaa.getFullYear();
+    const month = aaa.getMonth() + 1;
+    const day = aaa.getDate();
+    const timeFormat = year + "-" + month + "-" + day;
+    console.log(timeFormat)
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
@@ -6664,6 +6670,14 @@ export default {
             } else if (command == "c") {
               this.print_lhd = true;
             } else if (command == "q") {
+              this.Printinglist.forEach(item => {
+                const dateMat = new Date(item.fBsdate);
+                const year = dateMat.getFullYear();
+                const month = dateMat.getMonth() + 1;
+                const day = dateMat.getDate();
+                const time = year + "-" + month + "-" + day;
+                this.$set(item, 'time', time)
+              })
               this.print_signFor = true;
             } else if (command == "d") {
               let date = new Date();

src/views/Warehousing/outStock/index.vue

@@ -124,18 +124,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -558,6 +555,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -698,7 +696,7 @@ export default {
         },
         {
           surface: "19",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1129,6 +1127,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/stockTransfer/index.vue

@@ -124,18 +124,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -542,6 +539,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -661,7 +659,7 @@ export default {
         },
         {
           surface: "16",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1086,6 +1084,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus:null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];