From df2f7805e404c287801a2458de0a33c255846513 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Tue, 26 Mar 2024 11:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B93.26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receive/receiveApplyAdd.vue               | 10 ++------
 .../claimAndRefund/receive/receiveManage.vue  |  3 +--
 .../receiveByCq/receiveApplyAddByCq.vue       | 10 ++------
 .../receiveByCq/receiveManage.vue             |  3 +--
 .../claimAndRefund/return/returnApplyAdd.vue  | 17 ++-----------
 .../return/returnApplyAddByCq.vue             | 17 ++-----------
 .../claimAndRefund/return/returnExamine.vue   |  6 ++---
 .../secondStore/inStoreBook.vue               | 19 ++++++++++++++-
 .../secondStore/outStoreBook.vue              | 24 ++++++++++++++++---
 .../secondStore/secondStore.vue               | 19 ++++++++++++++-
 .../src/views/store/label/labelBinding.vue    |  2 +-
 .../views/store/label/labelBindingHistory.vue |  2 +-
 sgzb-ui/src/views/store/tools/devices.vue     |  2 +-
 13 files changed, 72 insertions(+), 62 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index e63188a7..9fbf92b8 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -602,14 +602,8 @@ export default {
     },
    
     checkNum(row){
-      if(row.preNum>=0){
-        // if(row.preNum>=row.num){
-          // row.preNum = row.num
-        // }else{
-          row.preNum = row.preNum
-        // }
-      }else{
-        row.preNum = 0
+      if(row.preNum<=1){
+        row.preNum = 1
       }
     },
     /////// 设备类型树  切换
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 403b1547..e380fc6a 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -305,8 +305,7 @@ export default {
     async GetUserInfo(){
       const res = await getInfo()
       this.user = res.user
-      this.user.roles.for
-      console.log(this.user)
+      // console.log(this.user)
       this.getList();
     },
     /** 查询列表 */
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
index 36af1f27..21256a96 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
@@ -631,14 +631,8 @@ export default {
     },
    
     checkNum(row){
-      if(row.preNum>=0){
-        // if(row.preNum>=row.num){
-          // row.preNum = row.num
-        // }else{
-          row.preNum = row.preNum
-        // }
-      }else{
-        row.preNum = 0
+      if(row.preNum<=1){
+        row.preNum = 1
       }
     },
     /////// 设备类型树  切换
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
index 891fb585..609140f5 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
@@ -292,8 +292,7 @@ export default {
     async GetUserInfo(){
       const res = await getInfo()
       this.user = res.user
-      this.user.roles.for
-      console.log(this.user)
+      // console.log(this.user)
       this.getList();
     },
     /** 查询列表 */
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 40a4d629..56f2b5ce 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -756,22 +756,9 @@ export default {
     },
 
     checkNum(row){
-      if(row.num>=0){
-        row.num = row.num
-      }else{
-        row.num = 0
+      if(row.num<=1){
+        row.num = 1
       }
-      // if(row.num>=0){
-      //   if(row.num>=row.preNum){
-      //     row.num = Number(row.preNum)
-      //   }else{
-      //     row.num = row.num
-      //   }
-      // }else{
-      //   row.num = 0
-      // }
-
-
     },
 
     /////// 设备类型树  切换
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
index 6fe6e7f3..ff3a947e 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
@@ -756,22 +756,9 @@ export default {
     },
 
     checkNum(row){
-      if(row.num>=0){
-        row.num = row.num
-      }else{
-        row.num = 0
+      if(row.num<=1){
+        row.num = 1
       }
-      // if(row.num>=0){
-      //   if(row.num>=row.preNum){
-      //     row.num = Number(row.preNum)
-      //   }else{
-      //     row.num = row.num
-      //   }
-      // }else{
-      //   row.num = 0
-      // }
-
-
     },
 
     /////// 设备类型树  切换
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 8059f2e8..f2d1a736 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -797,10 +797,8 @@ export default {
       }
     },
     checkNum(row){
-      if(row.num>=0){
-        row.num = row.num
-      }else{
-        row.num = 0
+      if(row.num<=1){
+        row.num = 1
       }
     },
     handleExam() {
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
index 193a836d..a862381f 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
@@ -18,6 +18,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="工程名称" prop="proId">
+        <el-select v-model="queryParams.proId" placeholder="请选择工程名称"  clearable>
+          <el-option
+            v-for="item in proList" filterable 
+            :key="item.id" :label="item.name" :value="item.id" 
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="类型名称" prop="typeId">
         <el-select
           v-model="queryParams.typeId"
@@ -68,6 +76,7 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" />
       <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
       <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
       <el-table-column label="退库数量" align="center" prop="num" :show-overflow-tooltip="true" />
@@ -89,7 +98,7 @@
 
 <script>
 import { getOperateList  } from "@/api/claimAndRefund/secondStore";
-import { getUnitData } from "@/api/claimAndRefund/receive.js"
+import { getUnitData,getProData } from "@/api/claimAndRefund/receive.js"
 import { getTypeList } from "@/api/store/warehousing";
 import { equipmentTypeTree } from "@/api/store/tools";
 import Treeselect from "@riophae/vue-treeselect";
@@ -124,6 +133,7 @@ export default {
       dateRange: [],
         // 单位数据
         unitList: [],
+        proList: [],
       //搜索下拉数据
       typeList: [],
       equipmentTypeList: [],
@@ -141,6 +151,7 @@ export default {
   created() {
     this.getTypeList();
     this.getUnitList();
+    this.getProList();
     this.equipmentType();
     this.getList();
   },
@@ -151,6 +162,12 @@ export default {
         this.unitList =  response.data;
         })
     },
+    //获取工程
+    getProList(){
+      getProData().then(response => {
+        this.proList =  response.data;
+        })
+    },
     getTypeList() {
       getTypeList({level:'3'}).then(response => {
           this.typeList = response.data;
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
index 6ae06553..78066af2 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
@@ -18,6 +18,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="工程名称" prop="proId">
+        <el-select v-model="queryParams.proId" placeholder="请选择工程名称"  clearable>
+          <el-option
+            v-for="item in proList" filterable 
+            :key="item.id" :label="item.name" :value="item.id" 
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="类型名称" prop="typeId">
         <el-select
           v-model="queryParams.typeId"
@@ -71,6 +79,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" />
       <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
       <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
       <el-table-column label="出库数量" align="center" prop="num" :show-overflow-tooltip="true" />
@@ -92,7 +101,7 @@
 
 <script>
 import { getOperateList } from "@/api/claimAndRefund/secondStore";
-import { getUnitData } from "@/api/claimAndRefund/receive.js"
+import { getUnitData,getProData } from "@/api/claimAndRefund/receive.js"
 import { getTypeList } from "@/api/store/warehousing";
 import { equipmentTypeTree } from "@/api/store/tools";
 import Treeselect from "@riophae/vue-treeselect";
@@ -117,6 +126,8 @@ export default {
       total: 0,
       // 字典表格数据
       tableList: [],
+      unitList: [],
+      proList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -138,16 +149,23 @@ export default {
   created() {
     this.getTypeList();
     this.getUnitList();
+    this.getProList();
     this.equipmentType();
     this.getList();
   },
   methods: {
-      //获取单位
-      getUnitList(){
+    //获取单位
+    getUnitList(){
       getUnitData().then(response => {
         this.unitList =  response.data;
         })
     },
+    //获取工程
+    getProList(){
+      getProData().then(response => {
+        this.proList =  response.data;
+        })
+    },
     getTypeList() {
       getTypeList({level:'3'}).then(response => {
           this.typeList = response.data;
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index 29628577..2c61f9d9 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -18,6 +18,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="工程名称" prop="proId">
+        <el-select v-model="queryParams.proId" placeholder="请选择工程名称"  clearable>
+          <el-option
+            v-for="item in proList" filterable 
+            :key="item.id" :label="item.name" :value="item.id" 
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="类型名称" prop="typeId">
         <el-select
           v-model="queryParams.typeId"
@@ -70,6 +78,7 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" />
       <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
       <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
       <el-table-column label="进场数量" align="center" prop="jcNum" :show-overflow-tooltip="true">
@@ -234,7 +243,7 @@
 
 <script>
 import { secondaryWarehouseList,operate,getRecords  } from "@/api/claimAndRefund/secondStore";
-import { getUnitData } from "@/api/claimAndRefund/receive.js"
+import { getUnitData,getProData } from "@/api/claimAndRefund/receive.js"
 import { getTypeList } from "@/api/store/warehousing";
 import { equipmentTypeTree } from "@/api/store/tools";
 import Treeselect from "@riophae/vue-treeselect";
@@ -268,6 +277,7 @@ export default {
       dateRange: [],
       // 单位数据
       unitList: [],
+      proList: [],
       //搜索下拉数据
       typeList: [],
       equipmentTypeList: [],
@@ -319,6 +329,7 @@ export default {
   created() {
     this.getTypeList();
     this.getUnitList();
+    this.getProList();
     this.equipmentType();
     
     this.getList();
@@ -330,6 +341,12 @@ export default {
         this.unitList =  response.data;
         })
     },
+    //获取工程
+    getProList(){
+      getProData().then(response => {
+        this.proList =  response.data;
+        })
+    },
     getTypeList() {
       getTypeList({level:'3'}).then(response => {
           this.typeList = response.data;
diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index 79b25c76..7c516ae6 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -507,7 +507,7 @@ export default {
       codeId: true,
       isShowQrCode: -1,
       labelmaCode: '',
-      qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=',
+      qrUrl:'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=',
       json_fields:{"二维码地址":'exportUrl',"标签编号":'labelCode',"设备编码":'maCode'},
     };
   },
diff --git a/sgzb-ui/src/views/store/label/labelBindingHistory.vue b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
index 8da7b018..9dd4c61c 100644
--- a/sgzb-ui/src/views/store/label/labelBindingHistory.vue
+++ b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
@@ -183,7 +183,7 @@ export default {
       rowObj: {},
       labelmaCode: '',
       uploadOpen: false,
-      qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=',
+      qrUrl:'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=',
     };
   },
   created() {
diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue
index fc6f4d2d..9ec4807d 100644
--- a/sgzb-ui/src/views/store/tools/devices.vue
+++ b/sgzb-ui/src/views/store/tools/devices.vue
@@ -384,7 +384,7 @@ export default {
       title: "",
       uploadOpen: false,
       qrCode: '',
-      qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=',
+      qrUrl:'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=',
       rowObj:{},
       // 是否显示弹出层
       open: false,