解决冲突

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-18 13:46:30
+ # @LastEditTime: 2024-02-21 15:27:58
  # @LastEditors: zhp
  # @Description:
 ###
@@ -13,27 +13,25 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
+# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
 # VUE_APP_BASE_API = 'http://192.168.0.30:8888'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-# dcs地址
-VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 # socket地址
-# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
-VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
+VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
-# VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 

.env.prod

@@ -16,6 +16,9 @@ VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
+# socket地址
+VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 
 # 根据服务器或域名修改

.env.stage

@@ -14,6 +14,8 @@ VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
 
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+# socket地址
+VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
 
 
 # 根据服务器或域名修改

public/index.html

@@ -8,6 +8,10 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 	<link rel="stylesheet" type="text/css" media="print" href="<%= BASE_URL %>print-lock.css">
 	<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+	<meta http-equiv="Expires" content="0">
+	<meta http-equiv="Pragma" content="no-cache">
+	<meta http-equiv="Cache-control" content="no-cache">
+	<meta http-equiv="Cache" content="no-cache">
 	<title>
 		<%= webpackConfig.name %>
 	</title>

src/layout/components/TagsView/index.vue

@@ -88,23 +88,26 @@ export default {
 		visitedViews(newVal, oldVal){
 			let num = 0
 			newVal && newVal.map(item => {
+				console.log(item)
 				if (item.path === '/databoard/kiln' || item.path === '/databoard/whole-plant' || item.path === '/databoard/deep-processing') {
 					num++
 				}
 			})
-			if (num > 0) {
+			this.$nextTick(() => {
-				if(!this.wsIsOpen) {
+				if (num > 0) {
-					getDcsMsg()
+					if(!this.wsIsOpen) {
-					this.wsIsOpen = true
+						getDcsMsg()
-					console.log('开启websocket==========')
+						this.wsIsOpen = true
+						console.log('开启websocket==========')
+					}
+				}else{
+					if (this.wsIsOpen) {
+						closeDcsMsg()
+						this.wsIsOpen = false
+						console.log('关闭============')
+					}
 				}
-			}else{
+			})
-				if (this.wsIsOpen) {
-					closeDcsMsg()
-					this.wsIsOpen = false
-					console.log('关闭============')
-				}
-			}
 		}
 	},
 	mounted() {

src/views/OperationalOverview/AGVBoard.vue

@@ -757,6 +757,9 @@ export default {
     this.init()
     this.getTimes()
     this.windowWidth(document.documentElement.clientWidth)
+    setTimeout(() => {
+      window.location.reload()
+    }, 86400000)
   },
   mounted() {
     const _this = this;

src/views/OperationalOverview/coldBoard.vue

@@ -394,6 +394,9 @@ export default {
     // this.fetchList('order-process')
     // this.fetchList('line-chart-data')
     this.init()
+    setTimeout(() => {
+      window.location.reload()
+    }, 86400000)
   },
   destroyed() {
     this.funInitWebSocket()

src/views/OperationalOverview/components/doubleYChart .vue

@@ -141,7 +141,8 @@ export default {
               }
             }
           },
-          data: passRateList
+          // data: passRateList
+          data: []
         }
       ]
       // const colors = ['#5470C6', '#91CC75', '#EE6666']

src/views/OperationalOverview/processingBoard.vue

@@ -610,6 +610,9 @@ export default {
     // this.fetchList('order-process')
     // this.fetchList('line-chart-data')
     this.init()
+    setTimeout(() => {
+      window.location.reload()
+    }, 86400000)
   },
   destroyed () {
     this.websocketClose()

src/views/bpm/processInstance/detail.vue

@@ -89,7 +89,7 @@
       <el-form ref="updateAssigneeForm" :model="updateAssignee.form" :rules="updateAssignee.rules" label-width="110px">
         <el-form-item label="新审批人" prop="assigneeUserId">
           <el-select v-model="updateAssignee.form.assigneeUserId" clearable style="width: 100%">
-            <el-option v-for="item in userOptions" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
+            <el-option v-for="item in userOptions" :key="item.id" :label="item.nickname" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-form>

src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue

@@ -41,7 +41,7 @@
         </el-form-item>
         <el-form-item v-if="form.type === 10" label="指定角色" prop="roleIds">
           <el-select v-model="form.roleIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in roleOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+            <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 20 || form.type === 21" label="指定部门" prop="deptIds">
@@ -50,17 +50,17 @@
         </el-form-item>
         <el-form-item v-if="form.type === 22" label="指定岗位" prop="postIds">
           <el-select v-model="form.postIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in postOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+            <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 30 || form.type === 31 || form.type === 32" label="指定用户" prop="userIds">
           <el-select v-model="form.userIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in userOptions" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
+            <el-option v-for="item in userOptions" :key="item.id" :label="item.nickname" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 40" label="指定用户组" prop="userGroupIds">
           <el-select v-model="form.userGroupIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in userGroupOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+            <el-option v-for="item in userGroupOptions" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 50" label="指定脚本" prop="scripts">

src/views/cost/rawMaterialConfig/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-12-05 15:41:39
+ * @LastEditTime: 2024-02-19 09:36:50
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>

src/views/databoard/components/GasChart.vue

@@ -246,9 +246,7 @@ export default {
 						.map((_, index) => {
 							const today = new Date();
 							const dtimestamp = today - (index+1) * 24 * 60 * 60 * 1000;
-							return `${currentMonth < 10?'0'+currentMonth:currentMonth }.${new Date(
+							return `${new Date(dtimestamp).getMonth()+1}.${new Date(dtimestamp).getDate()}`;}).reverse()
-								dtimestamp
-							).getDate()}`;}).reverse()
 			}else if (this.chartTime == "月") {
 				if (currentMonth in [1, 3, 5, 7, 8, 10, 12]) {
 					days = 31;

src/views/login.vue

@@ -86,18 +86,18 @@
 							:model="loginForm"
 							:rules="LoginRules"
 							class="login-form">
-							<el-form-item prop="tenantName" v-if="tenantEnable">
+							<!-- <el-form-item prop="tenantName" v-if="tenantEnable">
 								<el-input
 									v-model="loginForm.tenantName"
 									type="text"
 									auto-complete="off"
 									placeholder="租户">
-									<!-- <svg-icon
+									<svg-icon
 										slot="prefix"
 										icon-class="tree"
-										class="el-input__icon input-icon" /> -->
+										class="el-input__icon input-icon" />
 								</el-input>
-							</el-form-item>
+							</el-form-item> -->
 							<!-- 账号密码登录 -->
 							<div>
 								<el-form-item prop="username">
@@ -244,25 +244,25 @@ export default {
 						trigger: 'blur',
 					},
 				],
-				tenantName: [
+				// tenantName: [
-					{ required: true, trigger: 'blur', message: '租户不能为空' },
+				// 	{ required: true, trigger: 'blur', message: '租户不能为空' },
-					{
+				// 	{
-						validator: (rule, value, callback) => {
+				// 		validator: (rule, value, callback) => {
-							// debugger
+				// 			// debugger
-							getTenantIdByName(value).then((res) => {
+				// 			getTenantIdByName(value).then((res) => {
-								const tenantId = res.data;
+				// 				const tenantId = res.data;
-								if (tenantId && tenantId >= 0) {
+				// 				if (tenantId && tenantId >= 0) {
-									// 设置租户
+				// 					// 设置租户
-									setTenantId(tenantId);
+				// 					setTenantId(tenantId);
-									callback();
+				// 					callback();
-								} else {
+				// 				} else {
-									callback('租户不存在');
+				// 					callback('租户不存在');
-								}
+				// 				}
-							});
+				// 			});
-						},
+				// 		},
-						trigger: 'blur',
+				// 		trigger: 'blur',
-					},
+				// 	},
-				],
+				// ],
 			},
 			loading: false,
 			redirect: undefined,

src/views/mp/autoReply/index.vue

@@ -32,7 +32,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/draft/index.vue

@@ -33,7 +33,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/freePublish/index.vue

@@ -31,7 +31,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/material/index.vue

@@ -33,7 +33,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/menu/index.vue

@@ -32,7 +32,7 @@ SOFTWARE.
     <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/message/index.vue

@@ -6,7 +6,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <!-- TODO 等待处理 -->

src/views/mp/statistics/index.vue

@@ -6,7 +6,7 @@
     <el-form ref="queryForm" size="small" :inline="true" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="accountId" @change="getSummary">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="时间范围" prop="date">

src/views/mp/tag/index.vue

@@ -6,7 +6,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="标签名称" prop="name">

src/views/mp/user/index.vue

@@ -6,7 +6,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="用户标识" prop="openid">

src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue

@@ -9,8 +9,8 @@
         <div class="itemBox">
           <div class="itemClass" v-for="(item, index) in realtimeList" :key='index'>
             <div class="itemSub">
-              <p class="itemNum">{{item.checkValue}}</p>
+              <p class="itemNum">{{item.checkValue ? (item.checkValue).toFixed(2) : '-'}}</p>
-              <p class="itemDescribe">
+              <p class="itemDescribe" :title="item.name">
                 <img src="./../../../../../assets/images/detectionData.png" alt="">
               {{item.name}}</p>
             </div>
@@ -123,6 +123,9 @@ export default {
           .itemDescribe {
             font-size: 16px;
             text-align: right;
+            white-space: nowrap; /* 防止换行 */
+            overflow: hidden; /* 隐藏超出部分 */
+            text-overflow: ellipsis; /* 添加省略号 */
           }
         }
       }

src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue

@@ -9,8 +9,8 @@
         <div class="itemBox">
           <div class="itemClass" v-for="(item, index) in realtimeList" :key='index'>
             <div class="itemSub">
-              <p class="itemNum">{{item.checkValue}}</p>
+              <p class="itemNum">{{item.checkValue ? (item.checkValue).toFixed(2) : '-'}}</p>
-              <p class="itemDescribe">
+              <p class="itemDescribe" :title="item.name">
                 <img src="./../../../../../assets/images/detectionData.png" alt="">
               {{item.name}}</p>
             </div>
@@ -123,6 +123,9 @@ export default {
           .itemDescribe {
             font-size: 16px;
             text-align: right;
+            white-space: nowrap; /* 防止换行 */
+            overflow: hidden; /* 隐藏超出部分 */
+            text-overflow: ellipsis; /* 添加省略号 */
           }
         }
       }

src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue

@@ -8,8 +8,8 @@
       <div class="itemBox">
         <div class="itemClass" v-for="(item, index) in realtimeList" :key='index'>
           <div class="itemSub">
-            <p class="itemNum">{{item.checkValue}}</p>
+            <p class="itemNum">{{item.checkValue ? (item.checkValue).toFixed(2) : '-'}}</p>
-            <p class="itemDescribe">
+            <p class="itemDescribe" :title="item.name">
               <img src="./../../../../../assets/images/detectionData.png" alt="">
             {{item.name}}</p>
           </div>
@@ -120,6 +120,9 @@ export default {
           .itemDescribe {
             font-size: 16px;
             text-align: right;
+            white-space: nowrap; /* 防止换行 */
+            overflow: hidden; /* 隐藏超出部分 */
+            text-overflow: ellipsis; /* 添加省略号 */
           }
         }
       }

src/views/system/dept/index.vue

@@ -76,7 +76,7 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="leaderUserId">
               <el-select v-model="form.leaderUserId" placeholder="请输入负责人" clearable style="width: 100%">
-                <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
+                <el-option v-for="item in users" :key="item.id" :label="item.nickname" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>

src/views/system/notify/template/index.vue

@@ -117,7 +117,7 @@
         </el-form-item>
         <el-form-item label="接收人" prop="userId">
           <el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%">
-            <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
+            <el-option v-for="item in users" :key="item.id" :label="item.nickname" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item v-for="param in sendNotifyForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param">

src/views/system/user/index.vue

@@ -415,9 +415,9 @@
 						<el-select v-model="form.roleIds" multiple placeholder="请选择">
 							<el-option
 								v-for="item in roleOptions"
-								:key="parseInt(item.id)"
+								:key="item.id"
 								:label="item.name"
-								:value="parseInt(item.id)"></el-option>
+								:value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-form>

src/views/warehouse/end-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:55
+ * @LastEditTime: 2024-02-19 09:32:47
  * @Description:
 -->
 <template>
@@ -51,7 +51,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>

src/views/warehouse/out-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:47
+ * @LastEditTime: 2024-02-19 09:33:00
  * @Description:
 -->
 <template>
@@ -51,7 +51,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>

src/views/warehouse/package-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:37
+ * @LastEditTime: 2024-02-19 09:33:09
  * @Description:
 -->
 <template>
@@ -51,7 +51,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>

src/views/warehouse/part-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:28
+ * @LastEditTime: 2024-02-19 09:32:38
  * @Description:
 -->
 <template>
@@ -51,7 +51,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>

src/views/warehouse/raw-material/warehouseGoods/add-or-updata.vue

@@ -51,7 +51,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>

src/views/warehouse/warehouse-info/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:14:37
+ * @LastEditTime: 2024-02-19 09:34:54
  * @Description:
 -->
 <template>
@@ -77,7 +77,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>

src/views/warehouse/warehouse-info/add-or-updata1.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-12-05 14:05:08
+ * @LastEditTime: 2024-02-19 09:34:05
  * @Description:
 -->
 <template>
@@ -47,7 +47,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
@@ -63,7 +63,7 @@
 							v-for="item in urlOptions.dictList.dict1"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>