Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/api/warehouseBusiness/warehouseInStock.js

@@ -147,6 +147,14 @@ export function detailStock(query) {
     params: query
   })
 }
+//详情列表（新）
+export function getDetailStock(query) {
+  return request({
+    url: 'warehouseBusiness/whgenleg/detailsList',
+    method: 'get',
+    params: query
+  })
+}
 
 //主表审核
 export function submitWarehousingApproval(data) {

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -1533,15 +1533,12 @@
 <!--                    @click.native.prevent="fixRow(scope.row, scope.$index)"-->
 <!--                    size="small"-->
 <!--                >修改-->
-<!--                </el-button-->
-                >
+<!--                </el-button>-->
                 <el-button
                     type="text"
                     @click.native.prevent="wDeleteRow(scope.$index, detailList1)"
                     size="small"
-                >移除
-                </el-button
-                >
+                >移除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -2022,7 +2019,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                    :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                    :disabled="browseStatus"
                     type="text"
                     @click.native.prevent="wDeleteRow(scope.$index, detailList)"
                     size="small"
@@ -2420,7 +2417,6 @@
               align="center"
               width="140px"
               label="业务单号"
-              :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <template slot-scope="scope">
               <el-input v-model="scope.row.fMblno" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入业务单号"></el-input>
@@ -5001,6 +4997,7 @@ export default {
     };
   },
   created() {
+    this.$set(this.form, 'fStltypeid', '1')
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
@@ -5470,7 +5467,7 @@ export default {
     //撤销审批
     revokeTwo(status) {
       let data = {
-        actId: 120,
+        actId: 190,
         billId: this.form.fId,
         id: this.form.fId,
         fidStatus: status,
@@ -5496,13 +5493,13 @@ export default {
     addOrUpdateHandle(form, status) {
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, 120, status);
+        this.$refs.addOrUpdate.init(form.fId, 190, status);
       });
     },
     addOrUpdateHand(form, status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, status, 120);
+        this.$refs.ApprovalComments.init(form.fId, status, 190);
       });
     },
     judgmentWarehouse() {
@@ -6121,7 +6118,7 @@ export default {
                     return false;
                   }
                 }
-                if (!this.warehouseDrList[item].fBillingway) {
+                if (!this.warehouseDrList[item].fFeeUnitid) {
                   if (item === "fBusinessType") {
                   } else {
                     this.$message.error(
@@ -6150,12 +6147,11 @@ export default {
                     return false;
                   }
                 }
-
-                if (!this.warehouseDrList[item].fBillingway) {
+                if (!this.warehouseCrList[item].fFeeUnitid) {
                   if (item === "fBusinessType") {
                   } else {
                     this.$message.error(
-                        "请维护收款信息第" + (Number(item) + 1) + "行计价单位"
+                      "请维护付款信息第" + (Number(item) + 1) + "行计价单位"
                     );
                     return false;
                   }
@@ -6512,9 +6508,85 @@ export default {
                     this.mblnoStatus = "";
                     this.form = response.data.warehouseBills;
                     this.form.fStltypeid = (this.form.fStltypeid).toString()
-                    console.log(this.form.fFeetunit)
                     // this.detailList = response.data.warehousebillsitems;
                     this.msgSuccess("保存成功");
+                    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;
+                          });
+                          console.log(response.data.warehouseBillsItem)
+                          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;
+                        }
+                      }
+                      treeselect(this.form.fWarehouseid).then((response) => {
+                        this.fWarehouseidOptions = response.data;
+                      });
+                    });
                     if (status == "goBack") {
                       this.cancel();
                     }

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -8134,21 +8134,6 @@ export default {
                           this.relevantAttachments = response.data.enclosures;
                         }
                       }
-                      // else {
-                      //   this.approvalStatus = false;
-                      //   this.browseStatus = false;
-                      //   this.$set(this.form, "fId", null);
-                      //   this.$set(this.form, "fMblno", null);
-                      //   this.$set(this.form, "fMarks", null);
-                      //   this.$set(this.form, "fProductName", null);
-                      //   this.$set(this.form, "warehouseStatus", null);
-                      //   this.$set(this.form, "fBillstatus", null);
-                      //   this.$set(this.form, "fItemsStatus", null);
-                      //   this.$set(this.form, "fNetweight", 0);
-                      //   this.$set(this.form, "fPlanvolumn", 0);
-                      //   this.$set(this.form, "fGrossweight", 0);
-                      //   // this.recordStatus = true
-                      // }
                     });
                     if (status == "goBack") {
                       this.cancel();

src/views/Warehousing/inStock/index.vue

@@ -125,18 +125,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>
@@ -457,7 +454,7 @@
           :height="tableHeight"
           @expand-change="expandChange"
         >
-          <el-table-column type="selection" fixed align="center" />
+          <el-table-column type="selection" fixed align="center" width="58" />
           <el-table-column type="expand" fixed="left">
             <template slot-scope="props">
               <el-table
@@ -526,6 +523,11 @@
             </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>
@@ -645,6 +647,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -789,7 +792,7 @@ export default {
         },
         {
           surface: "19",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,

src/views/analysis/stockDetail/index.vue

@@ -8,60 +8,67 @@
           <div @click="goPage(scope.row)"><el-link type="primary" :underline="false">{{ scope.row.fMblno }}</el-link></div>
         </template>
       </el-table-column>
-      <el-table-column label="货物属性" align="center" prop="fBusinessType" />
+      <el-table-column label="货物属性" align="center" prop="fBusinessType">
+        <template slot-scope="scope">
+          <div>{{ scope.row.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="属性详情" align="center" prop="fMarks" />
-      <el-table-column label="业务类型" align="center" prop="fBilltype" />
+      <el-table-column label="业务类型" align="center" prop="fbilltype" />
       <el-table-column label="业务日期" align="center" prop="fBsdate" />
       <el-table-column label="贸易方式" align="center" prop="fTrademodeid" />
       <el-table-column label="件数" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.fBilltype == '入库'">{{ scope.row.fQtyRK }}</div>
-          <div v-if="scope.row.fBilltype == '出库'">{{ scope.row.fQtyCK }}</div>
-          <div v-if="scope.row.fBilltype == '调拨'">{{ scope.row.fQtyDB }}</div>
-          <div v-if="scope.row.fBilltype == '货权转移'">
-            {{ scope.row.fQtyHZ }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货物通关'">
-            {{ scope.row.fQtyTG }}
-          </div>
+<!--          <div v-if="scope.row.fbilltype == '入库'">{{ scope.row.fQtyRK }}</div>-->
+<!--          <div v-if="scope.row.fbilltype == '出库'">{{ scope.row.fQtyCK }}</div>-->
+<!--          <div v-if="scope.row.fbilltype == '调拨'">{{ scope.row.fQtyDB }}</div>-->
+<!--          <div v-if="scope.row.fbilltype == '货权转移'">-->
+<!--            {{ scope.row.fQtyHZ }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货物通关'">-->
+<!--            {{ scope.row.fQtyTG }}-->
+<!--          </div>-->
+          <div>{{scope.row.qty}}</div>
         </template>
       </el-table-column>
       <el-table-column label="毛重" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.fBilltype == '入库'">
-            {{ scope.row.fGrossweightRK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '出库'">
-            {{ scope.row.fGrossweightCK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '调拨'">
-            {{ scope.row.fGrossweightDB }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货权转移'">
-            {{ scope.row.fGrossweightHZ }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货物通关'">
-            {{ scope.row.fGrossweightTG }}
-          </div>
+          <div>{{ scope.row.grossweight }}</div>
+<!--          <div v-if="scope.row.fbilltype == '入库'">-->
+<!--            {{ scope.row.fGrossweightRK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '出库'">-->
+<!--            {{ scope.row.fGrossweightCK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '调拨'">-->
+<!--            {{ scope.row.fGrossweightDB }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货权转移'">-->
+<!--            {{ scope.row.fGrossweightHZ }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货物通关'">-->
+<!--            {{ scope.row.fGrossweightTG }}-->
+<!--          </div>-->
         </template>
       </el-table-column>
       <el-table-column label="净重" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.fBilltype == '入库'">
-            {{ scope.row.fNetweightRK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '出库'">
-            {{ scope.row.fNetweightCK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '调拨'">
-            {{ scope.row.fNetweightDB }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货权转移'">
-            {{ scope.row.fNetweightHZ }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货物通关'">
-            {{ scope.row.fNetweightTG }}
-          </div>
+          <div>{{ scope.row.netweight }}</div>
+<!--          <div v-if="scope.row.fbilltype == '入库'">-->
+<!--            {{ scope.row.fNetweightRK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '出库'">-->
+<!--            {{ scope.row.fNetweightCK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '调拨'">-->
+<!--            {{ scope.row.fNetweightDB }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货权转移'">-->
+<!--            {{ scope.row.fNetweightHZ }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货物通关'">-->
+<!--            {{ scope.row.fNetweightTG }}-->
+<!--          </div>-->
         </template>
       </el-table-column>
     </el-table>
@@ -69,7 +76,7 @@
 </template>
 
 <script>
-import { detailStock } from "@/api/warehouseBusiness/warehouseInStock";
+import { detailStock, getDetailStock } from "@/api/warehouseBusiness/warehouseInStock";
 
 import { listCorps } from "@/api/basicdata/corps";
 
@@ -87,9 +94,25 @@ export default {
       stockDate: [],
       // 遮罩层
       loading: true,
+      // 货物属性
+      fStorageTypeOptions: [],
     };
   },
   created() {
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
+    });
+  },
+  activated() {
+    getDetailStock({
+      fId: this.$route.query.fId,
+      fWarehouseLocationid: this.$route.query.fWarehouseLocationid,
+    }).then((response) => {
+      this.loading = false;
+      console.log(response);
+      this.stockDate = response.data;
+    });
     // detailStock({
     //   fWarehouseLocationid: this.$route.query.fWarehouseLocationid,
     //   fTrademodeids: this.$route.query.fTrademodeids,
@@ -104,20 +127,16 @@ export default {
     //   this.stockDate = response.rows;
     // });
   },
-  activated() {
-    detailStock({
-      fWarehouseLocationid: this.$route.query.fWarehouseLocationid,
-      fTrademodeids: this.$route.query.fTrademodeids,
-      fBusinessType: this.$route.query.fBusinessType,
-      fGoodsid: this.$route.query.fGoodsid,
-      fCorpIds: this.$route.query.fCorpIds,
-      fMarks: this.$route.query.fMarks,
-      fMblno: this.$route.query.fMblno,
-    }).then((response) => {
-      this.loading = false;
-      console.log(response);
-      this.stockDate = response.rows;
-    });
+  filters: {
+    fStorageTypeFormat(row, fStorageTypeOptions) {
+      let fStorageType;
+      fStorageTypeOptions.map((e) => {
+        if (row == e.dictValue) {
+          fStorageType = e.dictLabel;
+        }
+      });
+      return fStorageType;
+    },
   },
   methods: {
        //列设置全选
@@ -196,7 +215,7 @@ export default {
     },
     //跳转审批页面
     goPage(row) {
-      switch (row.fBilltype) {
+      switch (row.fbilltype) {
         case "入库": {
           this.$router.push({
             path: "/business/inStock",

src/views/basicdata/dept/index.vue

@@ -381,7 +381,7 @@ export default {
     /** 查询仓库列表 */
     getList() {
       this.loading = true;
-      lazyListDept().then(res => {
+      lazyListDept(this.queryParams).then(res => {
         this.deptList = res.data
         this.loading = false
       })
@@ -445,6 +445,8 @@ export default {
       if (row != undefined) {
         this.form.parentId = row.fId;
       }
+      this.$set(this.form, 'fStatus', '0')
+      // this.form.fStatus = '0'
       this.open = true;
       this.title = "添加仓库";
       listDept().then(response => {
@@ -494,7 +496,8 @@ export default {
         }).then(function() {
           return delDept(row.fId);
         }).then(() => {
-          this.getList();
+          // this.getList();
+          location.reload();
           this.msgSuccess("删除成功");
         })
     }

src/views/finance/Invoicing/index.vue

@@ -1015,7 +1015,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item
-                  label="出入库日期"
+                  label="业务日期"
                   label-width="85px"
                   prop="fAccbilldate"
                   v-if="typevalue == 1 || typevalue == 3"
@@ -2424,13 +2424,13 @@ export default {
         },
       ],
       tableDate3: [
-        {
-          surface: "1",
-          label: "fName",
-          name: "货权方",
-          checked: 0,
-          width: 100,
-        },
+        // {
+        //   surface: "1",
+        //   label: "fName",
+        //   name: "货权方",
+        //   checked: 0,
+        //   width: 100,
+        // },
         {
           surface: "2",
           label: "fMblno",
@@ -2760,7 +2760,7 @@ export default {
     getRow() {
       let that = this;
       this.data = {
-        tableName: "付费",
+        tableName: "开票",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -2785,7 +2785,7 @@ export default {
     save() {
       this.showSetting = false;
       this.data = {
-        tableName: "付费",
+        tableName: "开票",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList,
       };
@@ -2796,7 +2796,7 @@ export default {
     //重置列表
     delRow() {
       this.data = {
-        tableName: "付费",
+        tableName: "开票",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -2822,7 +2822,7 @@ export default {
     getRow2() {
       let that = this;
       this.data = {
-        tableName: "付费明细",
+        tableName: "开票明细",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -2847,7 +2847,7 @@ export default {
     save2() {
       this.showSetting2 = false;
       this.data = {
-        tableName: "付费明细",
+        tableName: "开票明细",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList2,
       };
@@ -2858,7 +2858,7 @@ export default {
     //重置列表
     delRow2() {
       this.data = {
-        tableName: "付费明细",
+        tableName: "开票明细",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -2884,7 +2884,7 @@ export default {
     getRow3() {
       let that = this;
       this.data = {
-        tableName: "付费弹窗",
+        tableName: "开票弹窗",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -2909,7 +2909,7 @@ export default {
     save3() {
       this.showSetting3 = false;
       this.data = {
-        tableName: "付费弹窗",
+        tableName: "开票弹窗",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList3,
       };
@@ -2920,7 +2920,7 @@ export default {
     //重置列表
     delRow3() {
       this.data = {
-        tableName: "付费弹窗",
+        tableName: "开票弹窗",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {

src/views/finance/charge/index.vue

@@ -980,7 +980,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item
-            label="出入库日期"
+            label="业务日期"
             label-width="85px"
             prop="fAccbilldate"
             v-if="typevalue == 1 || typevalue == 3"
@@ -1677,13 +1677,13 @@ export default {
         },
       ],
       tableDate3: [
-        {
-          surface: "1",
-          label: "fName",
-          name: "货权方",
-          checked: 0,
-          width: 100,
-        },
+        // {
+        //   surface: "1",
+        //   label: "fName",
+        //   name: "货权方",
+        //   checked: 0,
+        //   width: 100,
+        // },
         {
           surface: "2",
           label: "fMblno",

src/views/finance/contrast/index.vue

@@ -1110,7 +1110,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接单日期" prop="acceptDateList">
+                <el-form-item label="业务日期" prop="acceptDateList">
                   <el-date-picker
                     v-model="TWareHouseFees.acceptDateList"
                     size="small"
@@ -2052,13 +2052,13 @@ export default {
         },
       ],
       tableDate3: [
-        {
-          surface: "1",
-          label: "fName",
-          name: "货权方",
-          checked: 0,
-          width: 100,
-        },
+        // {
+        //   surface: "1",
+        //   label: "fName",
+        //   name: "货权方",
+        //   checked: 0,
+        //   width: 100,
+        // },
         {
           surface: "2",
           label: "fFeesName",

src/views/finance/payment/index.vue

@@ -1015,7 +1015,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item
-                  label="出入库日期"
+                  label="业务日期"
                   label-width="85px"
                   prop="fAccbilldate"
                   v-if="typevalue == 1 || typevalue == 3"

src/views/index.vue

@@ -201,6 +201,7 @@
                 <div class="home_stock_table">
                   <span v-if="item.refno2 === 'SJRK'">入库</span>
                   <span v-else-if="item.actId === 1000">费用修改</span>
+                  <span v-else-if="item.refno2 === 'CDZZ'">场地直装</span>
                   <span v-else-if="item.refno2 === 'SJCK'">出库</span>
                   <span v-else-if="item.refno2 === 'HQZY'">货转</span>
                   <span v-else-if="item.refno2 === 'CKDB'">调拨</span>
@@ -1177,6 +1178,13 @@ export default {
     approval(row) {
       console.log(row)
       switch (row.refno2) {
+        case "CDZZ": {
+          this.$router.push({
+            path: "/business/inAndOutStock",
+            query: { id: row.billId }
+          })
+          break;
+        }
         case "FYBG": {
           this.$router.push({
             path: "/business/costModify",

src/views/morePage/stock/index.vue

@@ -640,6 +640,10 @@ export default {
                 e.refno2 = "费用变更";
                 break;
               }
+              case "CDZZ": {
+                e.refno2 = "场地直装";
+                break;
+              }
               case "SJRK": {
                 e.refno2 = "入库";
                 break;
@@ -741,6 +745,13 @@ export default {
     },
     approval(row) {
       switch (row.refno4) {
+        case "CDZZ": {
+          this.$router.push({
+            path: "/business/inAndOutStock",
+            query: { id: row.billId }
+          })
+          break;
+        }
         case "FYBG": {
           this.$router.push({
             path: "/business/costModify",

src/views/reportManagement/whgenleg/index.vue

@@ -1065,6 +1065,7 @@ export default {
       this.$router.push({
         path: "/analysis/stockDetail",
         query: {
+          fId: row.fId,
           fWarehouseLocationid: row.fWarehouseLocationid,
           fTrademodeids: row.fTrademodeids,
           fBusinessType: row.fBusinessType,

vue.config.js

@@ -35,11 +35,15 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.1.177:9010/`,
-        target: `http://192.168.1.194:9010/`,
+        // target: `http://192.168.1.194:9010/`,
+        // target: `http://192.168.1.111:9010/`,
+        // target: `http://192.168.1.116:9012/`,
+        // target: `http://192.168.1.116:9010/`,
         // target: `https://test.fms.tubaosoft.com/prod-api/`,
-        // target: `https://test.wms.tubaosoft.com/prod-api/`,
+        target: `https://test.wms.tubaosoft.com/prod-api/`,
         // target: `https://test.tms.tubaosoft.com/prod-api/`,
         // target: `https://test.ke.tubaosoft.com/prod-api/`,
+        // target: `http://lhsy.tubaosoft.com/prod-api/`,
 
         // target: `https://zd.tubaosoft.com/prod-api/`,
         // target: `https://jianqiao.tubaosoft.com/prod-api/`,