From f8c8fe6d7af0cedb3471734237e9d45b7d331394 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 23 Apr 2023 13:40:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/authDept.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 2aa03b6b..4d082a71 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -255,6 +255,7 @@
             <template slot-scope="scope">
               <el-button
                 type="text"
+                :disabled="scope.row.userId == 1"
                 @click.native.stop="removeUserDialog(scope.row)"
               >移除
               </el-button>

From 478333fc17b7110a9afc606c3b98f3ac8a6a08ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Sun, 23 Apr 2023 13:51:08 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/print/pdfBizPrintSet.vue       | 2 +-
 src/views/system/print/pdfCodePrintSet.vue      | 2 +-
 src/views/system/print/pdfLabelPrintSet.vue     | 2 +-
 src/views/system/print/pdfStatementPrintSet.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/system/print/pdfBizPrintSet.vue b/src/views/system/print/pdfBizPrintSet.vue
index 13f8dcb1..fbbc97b9 100644
--- a/src/views/system/print/pdfBizPrintSet.vue
+++ b/src/views/system/print/pdfBizPrintSet.vue
@@ -474,7 +474,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 2,
         busRlId: row.id,
         type: 1,
         name: "",
diff --git a/src/views/system/print/pdfCodePrintSet.vue b/src/views/system/print/pdfCodePrintSet.vue
index 83e938c9..2af1aacb 100644
--- a/src/views/system/print/pdfCodePrintSet.vue
+++ b/src/views/system/print/pdfCodePrintSet.vue
@@ -474,7 +474,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 2,
         busRlId: row.id,
         type: 1,
         name: "",
diff --git a/src/views/system/print/pdfLabelPrintSet.vue b/src/views/system/print/pdfLabelPrintSet.vue
index 55286b29..3071d96a 100644
--- a/src/views/system/print/pdfLabelPrintSet.vue
+++ b/src/views/system/print/pdfLabelPrintSet.vue
@@ -473,7 +473,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 0,
         busRlId: row.id,
         type: 1,
         name: "",
diff --git a/src/views/system/print/pdfStatementPrintSet.vue b/src/views/system/print/pdfStatementPrintSet.vue
index 6affff19..7859b488 100644
--- a/src/views/system/print/pdfStatementPrintSet.vue
+++ b/src/views/system/print/pdfStatementPrintSet.vue
@@ -473,7 +473,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 1,
         busRlId: row.id,
         type: 1,
         name: "",

From 9064b1351c62d3efafa66a83f9ff76ca87585d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Sun, 23 Apr 2023 13:55:01 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue       | 51 +++++++++-------
 src/views/inout/DialogCreateOrderSelect.vue | 65 ++++++++++++++-------
 vue.config.js                               |  4 +-
 3 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 24ea270d..bc0a1f1f 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -188,11 +188,15 @@
         <el-row v-if="documentShow">
           <el-col :span="11">
             <el-form-item prop="acceptance" label="预验收单据:">
-              <el-input
-                style="width:90%"
-                :disabled="true"
-                v-model="orderFormData.checkPreInOrders"
-              ></el-input>
+              <el-select style="width: 90%" v-model="orderFormData.checkPreInOrders" multiple placeholder="请选入单据">
+                <el-option
+                  v-for="(item,index) in orderFormData.checkPreInOrders"
+                  :key="item.index"
+                  :label="item"
+                  :value="item"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -292,6 +296,7 @@
       <dialog-create-order-select
         @giveselectbox="giveselectbox"
         :closeDialogtwo="closeDialogtwo"
+        :checkPreInOrders="orderFormData.checkPreInOrders"
       >
       </dialog-create-order-select>
     </el-dialog>
@@ -399,9 +404,9 @@ export default {
         action: [
           { required: true, message: "请选择单据类型", trigger: "change" },
         ],
-        acceptance:[
-          {required: true, message: "请选入预验收单据", trigger: "blur"},
-        ]
+        acceptance: [
+          { required: true, message: "请选入预验收单据", trigger: "blur" },
+        ],
       },
       isScan: true,
       scanText: "扫码录入：",
@@ -430,8 +435,8 @@ export default {
       viewBizVisible: false,
       viewCodeVisible: false,
       viewCodeDetailVisible: false,
-     
-      documentShow:false,//控制预选单显示隐藏
+
+      documentShow: false, //控制预选单显示隐藏
     };
   },
   components: {
@@ -459,15 +464,16 @@ export default {
         })
         .catch(() => {});
     },
-    //接收预选单传值
+    //接收预验单传值
     giveselectbox(val) {
-      this.orderFormData.checkPreInOrders = val;
-    },
+      this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val))
+},
     //仓库改变
     changeInv() {
       this.orderFormData.action = null;
-      if(this.documentShow=true){
-        this.documentShow=false
+      this.orderFormData.checkPreInOrders=null
+      if ((this.documentShow = true)) {
+        this.documentShow = false;
       }
       this.getBusTypeByInv();
     },
@@ -547,6 +553,8 @@ export default {
 
     //单据类型改变
     actionChange(item) {
+      this.orderFormData.checkPreInOption=null
+      this.orderFormData.checkPreInOrders=null
       this.curAction = this.getActionItem(item);
       if (
         (this.curAction.checkEnable && this.curAction.checkWebNew) ||
@@ -568,14 +576,13 @@ export default {
         this.orderFormData.fromInvCode = null;
         this.findFromInvList();
       }
-      if(this.curAction.scanPreIn = true  &&  this.curAction.backPreinType == 1){
-        this.documentShow=true
-      }
-      else{
-        this.documentShow=false
+      if (
+        (this.curAction.scanPreIn = true && this.curAction.backPreinType == 1)
+      ) {
+        this.documentShow = true;
+      } else {
+        this.documentShow = false;
       }
-     this.giveselectbox();
-
     },
 
     //获取往来仓库列表
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 74f699d3..e407bbd4 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -117,15 +117,20 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table
         ref="multipleTable"
-        @select="select"
+        @select-all="handleAll"
+        :header-cell-class-name="leftheaderStyle"
+        @selection-change="handleSelectionChange"
         v-loading="loading"
         :data="list"
         style="width: 100%"
         highlight-current-row
         border
-        @row-click="handleSelectionChange"
       >
-        <!-- <el-table-column type="selection" width="55"></el-table-column> -->
+        <el-table-column
+          type="selection"
+          :selectable="checkSelection"
+          width="55"
+        ></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
           label="扫码单据类型"
@@ -245,6 +250,10 @@ export default {
       type: Function,
       required: true,
     },
+    checkPreInOrders: {
+      type: Array,
+      required: true,
+    },
   },
   data() {
     return {
@@ -361,8 +370,9 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
-      selectboxs: [],
-      selectbox: "",
+      multipleSelection: [],
+      selectbox: [],
+      selectRow: null,
     };
   },
   components: {},
@@ -402,20 +412,23 @@ export default {
     //选入
     combine() {
       this.closeDialogtwo();
-      this.$emit("giveselectbox", this.currentRow.billNo);
+      this.$emit("giveselectbox", this.selectbox);
     },
-    //   //选择
-    //   select(selection,row){
 
-    //     //   console.log(row);
-    //     this.selectboxs.push(row)
-    //     let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
-    //      let qwe = nerArr.map(item=>{
-    //   // 每一项的单号
-    //   return item.billNo
-    // })
-    //     this.selectbox=qwe
-    //   },
+    //选择框根据已选入判断禁用方法
+    checkSelection(row, index) {
+      let flag = true;
+      if (this.checkPreInOrders.length === 0) {
+        flag = true;
+      } else {
+        if (this.checkPreInOrders.includes(row.billNo)) {
+          flag = false;
+        } else {
+          flag = true;
+        }
+      }
+      return flag;
+    },
     //关闭对话框
     closeLocalDialog() {},
     hideSearch() {
@@ -432,10 +445,21 @@ export default {
         })
         .catch(() => {});
     },
+    //多行勾选
     handleSelectionChange(val) {
-      this.currentRow = val;
-      console.log(this.currentRow.billNo);
-      this.getOrderDetails();
+      let checkboxs = JSON.parse(JSON.stringify(val));
+      this.multipleSelection = checkboxs.map((item) => {
+        return item.billNo;
+      });
+      let hebin = [...this.checkPreInOrders, ...this.multipleSelection];
+      let boxarry = Array.from(new Set(hebin));
+      this.selectbox = boxarry;
+    },
+    //全选
+    handleAll(selection) {
+      if(selection.length==0){
+           this.$refs.multipleTable.clearSelection()
+      }   
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -726,4 +750,5 @@ export default {
 </script>
 
 <style type="text/scss" lang="scss">
+
 </style>
diff --git a/vue.config.js b/vue.config.js
index bf23e227..eef5677e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,9 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-
-
-        target: `http://192.168.0.66:9150/UDI_WMS_MC/`,
+        target: `http://192.168.0.166:9991/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From ccb369a2489af484f75ed5bff83f7ffab32958da Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 23 Apr 2023 14:33:35 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/invWarehouse.vue | 125 +++++++++++++++++--------
 1 file changed, 84 insertions(+), 41 deletions(-)

diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index dcdf99ad..469f037e 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -9,6 +9,20 @@
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
+        <!-- <el-form-item class="query-form-item" label="仓库类型:">
+          <el-input
+
+            clearable
+            placeholder="仓库类型"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="仓库类型" prop="advanceType">
+          <el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
+            <el-option label="入账库" :value="1"/>
+            <el-option label="预验收库" :value="2"/>
+            <el-option label="寄售库" :value="3"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@@ -28,34 +42,48 @@
       >
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column
-          prop="name"
-          label="仓库名称"
+          prop="code"
+          width="140"
+          label="仓库编码"
         >
         </el-table-column>
         <el-table-column
-          prop="code"
-          label="仓库编码"
+          width="160"
+          prop="name"
+          label="仓库名称"
         >
         </el-table-column>
         <el-table-column
           prop="parentName"
+          width="180"
           label="所属部门"
         >
         </el-table-column>
+        <el-table-column width="160"
+                         prop="parentInvName"
+                         label="上级仓库"
+        >
+        </el-table-column>
         <el-table-column
-          prop="parentInvName"
-          label="上级仓库"
+          width="140"
+          prop="advanceType"
+          label="仓库类型"
         >
+
+          <template slot-scope="scope">
+            <span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span>
+          </template>
+
         </el-table-column>
-        <!--<el-table-column label="允许供应商使用" prop="spUse">-->
-        <!--  <template slot-scope="scope">-->
-        <!--    <el-tag :type="scope.row.spUse | spUerFilterType">{{-->
-        <!--        scope.row.spUse | spUerFilterName-->
-        <!--      }}-->
-        <!--    </el-tag>-->
-        <!--  </template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="操作" class-name="small-padding fixed-width">
+        <el-table-column label="允许供应商使用" prop="spUse" width="140">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.spUse | spUerFilterType">{{
+                scope.row.spUse | spUerFilterName
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="220">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -168,11 +196,12 @@
           </el-row>
           <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
-              <el-form-item label="仓库类型" prop="advanceType" >
-                <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" style="width: 80%">
-                  <el-option  label="入账库"  value="1"/>
-                  <el-option  label="寄售库"  value="2"/>
-                  <el-option  label="预验收库" value="3"/>
+              <el-form-item label="仓库类型" prop="advanceType">
+                <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
+                           style="width: 80%">
+                  <el-option label="入账库" value="1"/>
+                  <el-option label="预验收库" value="2"/>
+                  <el-option label="寄售库" value="3"/>
                 </el-select>
               </el-form-item>
 
@@ -395,17 +424,22 @@ export default {
         // page: 1,
         // limit: 10,
       },
-      isAdvanceTypeShow:false,
-      isShow:false,
+      isAdvanceTypeShow: false,
+      isShow: false,
       loading: true,
       list: [],
       isExpandAll: true,
       total: 0,
+      advanceTypeTypeMap: {
+        1: "入账库",
+        3: "寄售库",
+        2: "预验收库",
+      },
       formMap: {
         add: "仓库信息-新增",
         edit: "仓库信息-编辑"
       },
-      invWouse:{},
+      invWouse: {},
       formName: null,
       configParms: {},
       currentCode: null,
@@ -424,6 +458,7 @@ export default {
         ]
       },
       subData: {},
+      subDataType:{},
       fromDeptOptions: [],
       invOptions: [],
       thirdSubQuery: {
@@ -448,6 +483,7 @@ export default {
       },
       sysList: [],
       sysSubList: [],
+      advanceTypese: [],
     };
   },
   methods: {
@@ -460,6 +496,7 @@ export default {
         name: "",
         status: "",
       };
+      this.subDataType.advanceType=null;
       this.getList();
 
       //置空用户列表和货位信息列表的参数
@@ -472,6 +509,7 @@ export default {
     },
 
     onSubmit() { //提交查询
+      this.query.advanceType=this.subDataType.advanceType;
       this.getList();
     },
 
@@ -483,6 +521,7 @@ export default {
           this.loading = false;
           let invlist = response.data || [];
           this.list = this.handleTree(invlist, "code", "parentCode");
+          console.log(this.list);
         })
         .catch(() => {
           this.loading = false;
@@ -491,34 +530,38 @@ export default {
         });
     },
     handleSubForm(data, formName) {   //新增，编辑
-      if(data != null ){
-        this.invWouse=data;
+      if (data != null) {
+        this.invWouse = data;
       }
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
-        this.subData.advanceType=this.subData.advanceType.toString();
-        if(this.subData.parentCode!=null && this.subData.parentCode!=""){
-          this.isAdvanceTypeShow=true;
-          this.isShow=false;
-        }else{
-          this.isAdvanceTypeShow=false;
-          this.isShow=true
-          this.subData.parentCode=null;
+        this.subData.advanceType = this.subData.advanceType.toString();
+        if (this.subData.parentCode != null && this.subData.parentCode != "") {
+          this.isAdvanceTypeShow = true;
+          this.isShow = false;
+        } else {
+          this.isAdvanceTypeShow = false;
+          this.isShow = true
+          this.subData.parentCode = null;
         }
       } else if (formName === "add") {
-        this.isShow=true
-        if(data==null){
-          this.isAdvanceTypeShow=false;
-          this.subData = {advanceType: '1', spUse: false,parentCode:null};
-        }else{
-          this.isAdvanceTypeShow=true;
-          this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code};
+        this.isShow = true
+        if (data == null) {
+          this.isAdvanceTypeShow = false;
+          this.subData = {advanceType: '1', spUse: false, parentCode: null};
+        } else {
+          this.isAdvanceTypeShow = true;
+          this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
+      //转换
+      let advanceTypese = this.subData.advanceType
+
+
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
-      if(this.subData.parentCode!=null && this.subData.parentCode!=""){
+      if (this.subData.parentCode != null && this.subData.parentCode != "") {
         filterSubAll(this.query)
           .then((response) => {
             let invList = response.data || [];

From cba812bfcbd005874ee50aae46ef37ee9d022fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Sun, 23 Apr 2023 14:40:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/order.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 031b8d65..d2e5e224 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -421,8 +421,13 @@ export function getOrderList(params) {
     params: params
   });
 }
-
-
+export function getOrderFilter(params) {
+  return axios({
+    url: "udiwms/inout/preInorder/filter",
+    method: "get",
+    params: params
+  });
+}
 export function updateStatus(query) {
   return axios({
     url: "/spms/inout/order/web/updateStatus",