解决冲突

src/api/reportManagement/whgenleg.js

@@ -9,6 +9,15 @@ export function listWhgenleg(query) {
   })
 }
 
+// 查询库存总账列表
+export function mapListWhgenleg(query) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/whgenlegList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询库存总账详细
 export function getWhgenleg(fAccyear) {
   return request({

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -467,7 +467,7 @@
                   <el-date-picker
                     v-model="scope.row.fBsdate"
                     style="width: 138px"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                     type="date"
                     value-format="timestamp"
                     placeholder="货转日期"
@@ -493,13 +493,13 @@
                   <el-input
                     @change="qtyChange(scope.row)"
                     v-model="scope.row.fQty"
-                    :disabled="browseStatus || scope.row.fBillstatus == 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                     placeholder="货转件数"
                   />
                 </span>
                 <span v-else-if="item.label == 'fGrossweight'">
                   <el-input
-                    :disabled="browseStatus || scope.row.fBillstatus == 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                     v-model="scope.row.fGrossweight"
                     @change="changeOutStock(scope.row)"
                     placeholder="货转毛重"
@@ -508,7 +508,7 @@
                 <span v-else-if="item.label == 'fNetweight'">
                   <el-input
                     v-model="scope.row.fNetweight"
-                    :disabled="browseStatus || scope.row.fBillstatus == 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                     @change="changeOutStock(scope.row)"
                     placeholder="货转净重"
                   />
@@ -518,13 +518,13 @@
                     oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                     v-model="scope.row.fCntqty"
                     placeholder="箱量"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                   />
                 </span>
                 <span v-else-if="item.label == 'fPackagespecs'">
                   <el-input
                     v-model="scope.row.fPackagespecs"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                     placeholder="包装规格"
                   />
                 </span>
@@ -532,14 +532,14 @@
                   <el-input
                     v-model="scope.row.fGoodsval"
                     placeholder="货值"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                   />
                 </span>
                 <span v-else-if="item.label == 'fLntype'">
                   <el-select
                     v-model="scope.row.fLntype"
                     placeholder="装卸方式"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                     style="width: 80%"
                   >
                     <el-option
@@ -554,29 +554,35 @@
                   <el-input
                     v-model="scope.row.fForkliftman"
                     placeholder="叉车工"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  />
+                </span>
+                <span v-else-if="item.label == 'fStevedore'">
+                  <el-input
+                    v-model="scope.row.fStevedore"
+                    placeholder="装卸工"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                   />
                 </span>
                 <span v-else-if="item.label == 'fLocalcntrno'">
                   <el-input
                     v-model="scope.row.fLocalcntrno"
                     placeholder="库内箱号"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                   />
                 </span>
                 <span v-else-if="item.label == 'fSealno'">
                   <el-input
                     v-model="scope.row.fSealno"
                     placeholder="封号"
-                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                   />
                 </span>
                 <span v-else-if="item.label == 'remark'">
                   <el-input
                     v-model="scope.row.remark"
                     placeholder="备注"
-                    :disabled="browseStatus"
-                    show-word-limit
+                    :disabled="browseStatus || scope.row.fBillstatus == 6"
                   />
                 </span>
                 <span v-else>{{ scope.row[item.label] }}</span>
@@ -593,9 +599,7 @@
                 <el-button
                   :disabled="
                     browseStatus ||
-                    scope.row.fBillstatus === 20 ||
-                    scope.row.fBillstatus === 30 ||
-                    scope.row.fBillstatus === 40
+                    scope.row.fBillstatus == 6
                   "
                   type="text"
                   @click.native.prevent="wDeleteRow(scope.$index, detailList)"
@@ -2213,27 +2217,34 @@ export default {
         },
         {
           surface: "21",
+          label: "fStevedore",
+          name: "装卸工",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "22",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "24",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "24",
+          surface: "25",
           label: "remark",
           name: "备注",
           checked: 0,

src/views/Warehousing/goodsTransfer/index.vue

@@ -541,8 +541,8 @@ export default {
       fMblnoOptions: [],
       show: false,
       drag: false,
-      tableDate:  [
-          {
+      tableDate: [
+        {
           surface: "0",
           label: "fMblno",
           name: "提单号",
@@ -685,6 +685,11 @@ export default {
     this.getRow();
     this.getList();
   },
+  activated() {
+    if (this.$route.query.id) {
+      this.handleUpdate(this.$route.query.id);
+    }
+  },
   methods: {
     //列设置全选
     allChecked() {
@@ -839,7 +844,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0];
+      const fId = row.fId || this.ids[0]|| row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -2193,6 +2193,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="装卸工" prop="fStevedore">
+                <el-input
+                  v-model="importList.fStevedore"
+                  style="width: 100%"
+                  placeholder="装卸工"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="库内箱号" prop="fLocalcntrno">
                 <el-input
                   v-model="importList.fLocalcntrno"
@@ -3444,27 +3453,34 @@ export default {
         },
         {
           surface: "21",
+          label: "fStevedore",
+          name: "装卸工",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "22",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "24",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "24",
+          surface: "25",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -3797,7 +3813,7 @@ export default {
     changefStltype(row) {
       this.fMblnoOptions.map((e) => {
         if (row == e.fId) {
-          this.$set(this.form, "fStltypeid", e.fStltypeid.toString());
+          this.$set(this.form, "fStltypeid", e.fStltypeid?e.fStltypeid.toString():null);
         }
       });
     },
@@ -4483,6 +4499,7 @@ export default {
             fGoodsval: this.importList.fGoodsval,
             fLntype: this.importList.fLntype,
             fForkliftman: this.importList.fForkliftman,
+            fStevedore: this.importList.fStevedore,
             fLocalcntrno: this.importList.fLocalcntrno,
             fSealno: this.importList.fSealno,
             fFleet: this.importList.fFleet,

src/views/Warehousing/inStock/index.vue

@@ -405,15 +405,15 @@
           :show-overflow-tooltip="true"
           sortable
         >
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <span v-if="item.label == 'fMblno'">
               <el-link :underline="false" type="primary"
-              ><div @click="handleUpdate(scope.row)">
-              {{ scope.row.fMblno }}
-            </div></el-link
+                ><div @click="handleUpdate(scope.row)">
+                  {{ scope.row.fMblno }}
+                </div></el-link
               >
             </span>
-            <span v-else>{{scope.row[item.label]}}</span>
+            <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -711,8 +711,13 @@ export default {
     this.getRow();
     this.getList();
   },
+  activated() {
+    if (this.$route.query.id) {
+      this.handleUpdate(this.$route.query.id);
+    }
+  },
   methods: {
-      //列设置全选
+    //列设置全选
     allChecked() {
       if (this.allCheck == true) {
         this.setRowList.map((e) => {
@@ -796,7 +801,7 @@ export default {
       });
     },
     //合计
-  getSum(param) {
+    getSum(param) {
       const { columns, data } = param;
       const sums = [];
       var values = [];
@@ -842,7 +847,7 @@ export default {
           }
           if (column.property === "fPlanqty") {
             if (sums[index]) {
-              sums[index] = sums[index]
+              sums[index] = sums[index];
             }
           }
         }
@@ -865,7 +870,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0];
+      const fId = row.fId || this.ids[0] || row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -971,6 +971,13 @@
                     :disabled="browseStatus || scope.row.fBillstatus >= 40"
                   />
                 </span>
+                <span v-else-if="item.label == 'fStevedore'">
+                  <el-input
+                    v-model="scope.row.fStevedore"
+                    placeholder="装卸工"
+                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                  />
+                </span>
                 <span v-else-if="item.label == 'fLocalcntrno'">
                   <el-input
                     v-model="scope.row.fLocalcntrno"
@@ -3091,27 +3098,34 @@ export default {
         },
         {
           surface: "26",
+          label: "fStevedore",
+          name: "装卸工",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "27",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "27",
+          surface: "28",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "28",
+          surface: "29",
           label: "fSerialNumber",
           name: "流水号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "29",
+          surface: "30",
           label: "remark",
           name: "备注",
           checked: 0,

src/views/Warehousing/outStock/index.vue

@@ -719,6 +719,11 @@ export default {
     this.getRow();
     this.getList();
   },
+  activated() {
+    if (this.$route.query.id) {
+      this.handleUpdate(this.$route.query.id);
+    }
+  },
   methods: {
     //列设置全选
     allChecked() {
@@ -873,7 +878,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0];
+      const fId = row.fId || this.ids[0]|| row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -894,6 +894,13 @@
                     :disabled="browseStatus || scope.row.fBillstatus >= 40"
                   />
                 </span>
+                <span v-else-if="item.label == 'fStevedore'">
+                  <el-input
+                    v-model="scope.row.fStevedore"
+                    placeholder="装卸工"
+                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                  />
+                </span>
                 <span v-else-if="item.label == 'fLocalcntrno'">
                   <el-input
                     v-model="scope.row.fLocalcntrno"
@@ -3304,34 +3311,41 @@ export default {
         },
         {
           surface: "25",
+          label: "fStevedore",
+          name: "装卸工",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "26",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "26",
+          surface: "27",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "27",
+          surface: "28",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "28",
+          surface: "29",
           label: "fSerialNumber",
           name: "流水号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "29",
+          surface: "30",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -3991,10 +4005,9 @@ export default {
         if (!this.Printinglist[item].fTruckno) {
           return this.$message.error("车号不能为空");
         }
-         if (!this.Printinglist[item].fTransferWarehouselocid) {
+        if (!this.Printinglist[item].fTransferWarehouselocid) {
           return this.$message.error("调入库位不能为空");
         }
-        
       }
       if (this.CntrTable.length > 0) {
         let arr = [];

src/views/Warehousing/stockTransfer/index.vue

@@ -699,6 +699,11 @@ export default {
     this.getRow();
     this.getList();
   },
+  activated() {
+    if (this.$route.query.id) {
+      this.handleUpdate(this.$route.query.id);
+    }
+  },
   methods: {
     //列设置全选
     allChecked() {
@@ -853,7 +858,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0];
+      const fId = row.fId || this.ids[0]|| row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

src/views/analysis/stockDetail/index.vue

@@ -199,12 +199,14 @@ export default {
         case "调拨": {
           this.$router.push({
             path: "/business/stockTransfer",
+            query: { id: row.fId },
           });
           break;
         }
         case "货权转移": {
           this.$router.push({
             path: "/business/stockTransfer",
+            query: { id: row.fId },
           });
           break;
         }

src/views/reportManagement/whgenleg/index.vue

@@ -95,6 +95,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="按照箱号">
+        <el-select
+          v-model="queryParams.isCntrno"
+          filterable
+          remote
+          style="width: 200px"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="(dict, index) in isCntrnoOptions"
+            :key="index.id"
+            :label="dict.name"
+            :value="dict.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="入库日期" prop="createTime">
         <el-date-picker
           v-model="queryParams.timeInterval"
@@ -512,7 +529,7 @@
 
 <script>
 import {
-  listWhgenleg,
+  mapListWhgenleg,
   getWhgenleg,
   delWhgenleg,
   addWhgenleg,
@@ -565,6 +582,7 @@ export default {
         pageNum: 1,
         pageSize: 50,
         fOriginalbillno: null,
+        isCntrno: null,
         fPreqty: null,
         fPregrossweight: null,
         fPrenetweight: null,
@@ -595,153 +613,139 @@ export default {
       drag: false,
       setRowList: [],
       getRowList: [],
-      tableDate: [
-          {
+      tableDate: [{
           surface: "0",
           label: "fMblno",
           name: "提单号",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "1",
           label: "fCorpid",
           name: "客户",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "2",
           label: "fOriginalbilldate",
           name: "入库日期",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "3",
           label: "fChargedate",
           name: "仓储费计算日期",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "4",
           label: "fBusinessTypes",
           name: "货物属性",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "5",
           label: "fMarks",
           name: "属性详情",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "6",
           label: "fGoodsids",
           name: "品名",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "8",
           label: "fWarehouseids",
           name: "仓库",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "9",
           label: "fTrademodeid",
           name: "贸易方式",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "10",
           label: "fQtyD",
           name: "入库件数",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "11",
           label: "fGrossweightD",
           name: "入库毛重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "12",
           label: "fNetweightD",
           name: "入库净重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "13",
           label: "fQtyC",
           name: "出库件数",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "14",
           label: "fGrossweightC",
           name: "出库毛重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "15",
           label: "fNetweightC",
           name: "出库净重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "16",
           label: "fQtyblc",
           name: "结余件数",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "17",
           label: "fGrossweightblc",
           name: "结余毛重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "18",
           label: "fNetweightblc",
           name: "结余净重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "19",
           label: "fCntrno",
           name: "箱号",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "20",
           label: "remark",
           name: "备注",
           checked: 0,
           width: 100,
-        },
-      ],
+        },],
       allCheck: false,
+      isCntrnoOptions: [{
+        id: 0,
+        name: '否'
+      }, {
+        id: 1,
+        name: '是'
+      }]
     };
   },
   created() {
@@ -942,7 +946,7 @@ export default {
     /** 查询库存总账列表 */
     getList() {
       this.loading = true;
-      listWhgenleg(this.queryParams).then((response) => {
+      mapListWhgenleg(this.queryParams).then((response) => {
         console.log(response);
         this.whgenlegList = response.rows;
         this.total = response.total;

vue.config.js

@@ -34,11 +34,20 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.137.1:9010`,
+        // 华为10M
+        // target: `http://121.36.212.131:9010/`,
+        // target: `http://121.36.212.131:9020/`,
+        target: `http://121.36.212.131:9030/`,
+        // 华为测试
+        // target: `http://124.70.179.5:9010/`,
+        // target: `http://124.70.179.5:9030`,
+        // target: `http://124.70.179.5:9080/`,
+        // 大木服务器
+        // target: `http://115.29.151.39:9010/`,
+        // target: `http://47.105.221.72:9010/`,
+        // target: `http://localhost:9020/`,
+        // target: `http://csmgn2.natappfree.cc`,
         // target: `http://engineering.echepei.com:9010/`,
-         target: `http://test.tms.tubaosoft.com:9010/`,
-        //  target: `https://test.fms.tubaosoft.com/prod-api/`,
-        //  target: `http://192.168.1.143:9010`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''