修改

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -557,6 +557,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"
@@ -2206,27 +2213,34 @@ export default {
         },
         {
           surface: "20",
+          label: "fStevedore",
+          name: "装卸工",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "21",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "21",
+          surface: "22",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "24",
           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;
         }