fenghy 4 年之前
父節點
當前提交
3c9eeefbe2

+ 8 - 0
src/api/warehouseBusiness/warehouseInStock.js

@@ -164,4 +164,12 @@ export function checkCode(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询查询仓管员id
+export function queryClerkRoleList() {
+  return request({
+    url: '/warehouseBusiness/inStock/queryClerkRoleList ',
+    method: 'get',
+  })
 }

+ 1 - 1
src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -4821,7 +4821,7 @@ export default {
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
-          this.$set(this.form, "fTrademodeid", "1");
+          this.$set(this.form, "fTrademodeid", "2");
           this.$set(this.form, "createTime", Date.parse(new Date()));
           this.$set(this.form, "fBstime", Date.parse(new Date()));
           this.$set(this.form, "fBusinessType", "0");

+ 8 - 1
src/views/Warehousing/cargoClearance/index.vue

@@ -661,6 +661,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "17",
+          label: "fBillno",
+          name: "系统编号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],
@@ -858,7 +865,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0]|| row;
+      const fId = row.fId || this.ids[0] || row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

+ 2 - 1
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -3763,10 +3763,11 @@ export default {
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
-          this.$set(this.form, "fTrademodeid", "1");
+          this.$set(this.form, "fTrademodeid", "2");
           this.$set(this.form, "createTime", Date.parse(new Date()));
           this.$set(this.form, "fBstime", Date.parse(new Date()));
           this.$set(this.form, "fBusinessType", "1");
+          this.$set(this.form, "fFeetUnit", "2");
         }
         if (response.dept !== null) {
           this.deptOptions = [];

+ 8 - 1
src/views/Warehousing/goodsTransfer/index.vue

@@ -647,6 +647,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fBillno",
+          name: "系统编号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],
@@ -844,7 +851,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0]|| row;
+      const fId = row.fId || this.ids[0] || row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

File diff suppressed because it is too large
+ 826 - 581
src/views/Warehousing/inStock/AddOrUpdate.vue


+ 7 - 0
src/views/Warehousing/inStock/index.vue

@@ -707,6 +707,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "22",
+          label: "fBillno",
+          name: "系统编号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],

+ 42 - 15
src/views/Warehousing/inStock/uploadExcel.vue

@@ -8,20 +8,35 @@
     v-dialogDrag
   >
     <span>
-      <div style="display: flex; justify-content: space-between">
-        <el-upload
-          :action="actionUrl"
-          multiple
-          :headers="headers"
-          :show-file-list="false"
-          :on-success="
-            (res) => {
-              handleSucces(res);
-            }
-          "
-        >
-          <el-button size="small" type="primary">导入Excel</el-button>
-        </el-upload>
+      <div
+        style="
+          display: flex;
+          justify-content: space-between;
+        "
+      >
+        <div style="display: flex;;margin-bottom: 10px;">
+          <el-upload
+            :action="actionUrl"
+            multiple
+            :headers="headers"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                handleSucces(res);
+              }
+            "
+          >
+            <el-button size="small" type="primary">导入Excel</el-button>
+          </el-upload>
+          <el-button
+            size="small"
+            type="primary"
+            @click="bathHandle"
+            :disabled="selection.length != 1"
+            style="margin-left:10px"
+            >批量处理属性(详情)</el-button
+          >
+        </div>
         <div style="margin: 0 10px">
           <el-button
             icon="el-icon-setting"
@@ -31,7 +46,7 @@
           ></el-button>
         </div>
       </div>
-      <el-table :data="excelList">
+      <el-table :data="excelList" @selection-change="Selectinventory">
         <el-table-column type="selection" width="50" align="center" fixed />
         <el-table-column
           label="序号"
@@ -386,6 +401,7 @@ export default {
       choiceWarehouse: false,
       oldList: [],
       form: {},
+      selection: [],
     };
   },
   created() {
@@ -596,6 +612,17 @@ export default {
       );
       this.choiceWarehouse = false;
     },
+    Selectinventory(selection) {
+      this.selection = selection;
+    },
+    bathHandle() {
+      this.excelList.map((e) => {
+        e.fBusinessType = this.selection[0].fBusinessType
+          ? this.selection[0].fBusinessType
+          : null;
+        e.fMarks = this.selection[0].fMarks ? this.selection[0].fMarks : null;
+      });
+    },
   },
   watch: {
     uploadExcelVisible() {

+ 1 - 1
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -5553,7 +5553,7 @@ export default {
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
-          this.$set(this.form, "fTrademodeid", "1");
+          this.$set(this.form, "fTrademodeid", "2");
           this.$set(this.form, "createTime", Date.parse(new Date()));
           this.$set(this.form, "fBstime", Date.parse(new Date()));
           this.$set(this.form, "fBusinessType", "5");

+ 7 - 0
src/views/Warehousing/outStock/index.vue

@@ -681,6 +681,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "20",
+          label: "fBillno",
+          name: "系统编号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],

+ 1 - 1
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -5273,7 +5273,7 @@ export default {
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
-          this.$set(this.form, "fTrademodeid", "1");
+          this.$set(this.form, "fTrademodeid", "2");
           this.$set(this.form, "createTime", Date.parse(new Date()));
           this.$set(this.form, "fBstime", Date.parse(new Date()));
           this.$set(this.form, "fBusinessType", "0");

+ 8 - 1
src/views/Warehousing/stockTransfer/index.vue

@@ -661,6 +661,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "17",
+          label: "fBillno",
+          name: "系统编号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],
@@ -858,7 +865,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0]|| row;
+      const fId = row.fId || this.ids[0] || row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

Some files were not shown because too many files changed in this diff