From 283a985dede9fd09cb820a79bb603d7ea34050fc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 14:26:17 +0800
Subject: [PATCH] 22

---
 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue |  149 ++++++++++++-------------------------------------
 1 files changed, 36 insertions(+), 113 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
index d65e7ab..b39ec37 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -5,7 +5,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
             <el-form-item label="鍏抽敭瀛�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="閮ㄤ欢鏉$爜,鎵规鍙�,璁㈠崟鍙�,鐢熶骇鍗曞彿,閮ㄤ欢鍚嶇О,鍖呰鍙�,閿�鍞悎鍚屽崟鍙�,绗嚑鍖�,缁忛攢搴楀悕绉�,浜у搧鍚嶇О,瀹㈡埛鍚嶇О,鍖呰缂栫爜,鑷彁or鍙戣揣,鍖呰閮ㄤ欢鎬绘暟閲�,鍖呰闈㈢Н,閮ㄤ欢灏哄,鏈烘鑷傛槸鍚︽棆杞�,鍒涘缓浜�,淇敼浜�,鏉愭枡"/>
+              <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="閮ㄤ欢鏉$爜,鎵规鍙�,璁㈠崟鍙�,鐢熶骇鍗曞彿,閮ㄤ欢鍚嶇О,鍖呰鍙�,閮ㄤ欢灏哄,鏈烘鑷傛槸鍚︽棆杞�,鏉愭枡,绗嚑鍖�,閿�鍞悎鍚屽崟鍙�,鍒涘缓浜�,淇敼浜�"/>
               
             </el-form-item>
           </el-col>
@@ -52,6 +52,15 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
+            <el-form-item label="鏍囪">
+              <el-select clearable="" v-model="queryParamsMes_BatchOrderUPI_New.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+                <el-option v-for="(item,index) in getEnumUpiFlagData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
+                
+              </el-select>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="閮ㄤ欢鍚嶇О">
               <el-input v-model="queryParamsMes_BatchOrderUPI_New.detailName" clearable="" placeholder="璇疯緭鍏ラ儴浠跺悕绉�"/>
               
@@ -72,12 +81,6 @@
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="鍘�">
               <el-input v-model="queryParamsMes_BatchOrderUPI_New.thk" clearable="" placeholder="璇疯緭鍏ュ帤"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="鏄惁浼樺寲鍖呰">
-              <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.isPA"  clearable="" placeholder="璇疯緭鍏ユ槸鍚︿紭鍖栧寘瑁�"/>
               
             </el-form-item>
           </el-col>
@@ -118,78 +121,6 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="绾哥闀�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info1" clearable="" placeholder="璇疯緭鍏ョ焊绠遍暱"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="绾哥瀹�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info2" clearable="" placeholder="璇疯緭鍏ョ焊绠卞"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="绾哥楂�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info3" clearable="" placeholder="璇疯緭鍏ョ焊绠遍珮"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="閿�鍞悎鍚屽崟鍙�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info4" clearable="" placeholder="璇疯緭鍏ラ攢鍞悎鍚屽崟鍙�"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="绗嚑鍖�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info6" clearable="" placeholder="璇疯緭鍏ョ鍑犲寘"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="缁忛攢搴楀悕绉�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info7" clearable="" placeholder="璇疯緭鍏ョ粡閿�搴楀悕绉�"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="浜у搧鍚嶇О">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info8" clearable="" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="瀹㈡埛鍚嶇О">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info10" clearable="" placeholder="璇疯緭鍏ュ鎴峰悕绉�"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="鍖呰缂栫爜">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info9" clearable="" placeholder="璇疯緭鍏ュ寘瑁呯紪鐮�"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="鑷彁or鍙戣揣">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info11" clearable="" placeholder="璇疯緭鍏ヨ嚜鎻恛r鍙戣揣"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="鍖呰閮ㄤ欢鎬绘暟閲�">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info12" clearable="" placeholder="璇疯緭鍏ュ寘瑁呴儴浠舵�绘暟閲�"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="鍖呰闈㈢Н">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info13" clearable="" placeholder="璇疯緭鍏ュ寘瑁呴潰绉�"/>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="閮ㄤ欢鏁伴噺">
               <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.info15"  clearable="" placeholder="璇疯緭鍏ラ儴浠舵暟閲�"/>
               
@@ -208,6 +139,24 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
+            <el-form-item label="鏉愭枡">
+              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info18" clearable="" placeholder="璇疯緭鍏ユ潗鏂�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
+            <el-form-item label="绗嚑鍖�">
+              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info6" clearable="" placeholder="璇疯緭鍏ョ鍑犲寘"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
+            <el-form-item label="閿�鍞悎鍚屽崟鍙�">
+              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info4" clearable="" placeholder="璇疯緭鍏ラ攢鍞悎鍚屽崟鍙�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="鍒涘缓鏃堕棿">
               <el-date-picker placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_BatchOrderUPI_New.createTimeRange" />
               
@@ -216,21 +165,6 @@
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="淇敼鏃堕棿">
               <el-date-picker placeholder="璇烽�夋嫨淇敼鏃堕棿" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_BatchOrderUPI_New.updateTimeRange" />
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="鏍囪">
-              <el-select clearable="" v-model="queryParamsMes_BatchOrderUPI_New.upiFlag" placeholder="璇烽�夋嫨鏍囪">
-                <el-option v-for="(item,index) in getEnumUpiFlagData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
-                
-              </el-select>
-              
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="鏉愭枡">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info18" clearable="" placeholder="璇疯緭鍏ユ潗鏂�"/>
               
             </el-form-item>
           </el-col>
@@ -275,42 +209,31 @@
               <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
             </template>
           </el-table-column>
+          <el-table-column prop="upiFlag" label="鏍囪"  show-overflow-tooltip="" >
+            <template #default="scope">
+              <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
+            </template>
+          </el-table-column>
         <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О"  show-overflow-tooltip="" />
         <el-table-column prop="length" label="闀�"  show-overflow-tooltip="" />
         <el-table-column prop="width" label="瀹�"  show-overflow-tooltip="" />
         <el-table-column prop="thk" label="鍘�"  show-overflow-tooltip="" />
-        <el-table-column prop="isPA" label="鏄惁浼樺寲鍖呰"  show-overflow-tooltip="" />
         <el-table-column prop="packageCode" label="鍖呰鍙�"  show-overflow-tooltip="" />
         <el-table-column prop="machineXCenter" label="鍖呰X鍧愭爣"  show-overflow-tooltip="" />
         <el-table-column prop="machineYCenter" label="鍖呰Y鍧愭爣"  show-overflow-tooltip="" />
         <el-table-column prop="machineZCenter" label="鍖呰Z鍧愭爣"  show-overflow-tooltip="" />
         <el-table-column prop="sequence" label="灞傛暟"  show-overflow-tooltip="" />
         <el-table-column prop="shelf" label="娆″簭"  show-overflow-tooltip="" />
-        <el-table-column prop="info1" label="绾哥闀�"  show-overflow-tooltip="" />
-        <el-table-column prop="info2" label="绾哥瀹�"  show-overflow-tooltip="" />
-        <el-table-column prop="info3" label="绾哥楂�"  show-overflow-tooltip="" />
-        <el-table-column prop="info4" label="閿�鍞悎鍚屽崟鍙�"  show-overflow-tooltip="" />
-        <el-table-column prop="info6" label="绗嚑鍖�"  show-overflow-tooltip="" />
-        <el-table-column prop="info7" label="缁忛攢搴楀悕绉�"  show-overflow-tooltip="" />
-        <el-table-column prop="info8" label="浜у搧鍚嶇О"  show-overflow-tooltip="" />
-        <el-table-column prop="info10" label="瀹㈡埛鍚嶇О"  show-overflow-tooltip="" />
-        <el-table-column prop="info9" label="鍖呰缂栫爜"  show-overflow-tooltip="" />
-        <el-table-column prop="info11" label="鑷彁or鍙戣揣"  show-overflow-tooltip="" />
-        <el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�"  show-overflow-tooltip="" />
-        <el-table-column prop="info13" label="鍖呰闈㈢Н"  show-overflow-tooltip="" />
         <el-table-column prop="info15" label="閮ㄤ欢鏁伴噺"  show-overflow-tooltip="" />
         <el-table-column prop="info16" label="閮ㄤ欢灏哄"  show-overflow-tooltip="" />
         <el-table-column prop="info17" label="鏈烘鑷傛槸鍚︽棆杞�"  show-overflow-tooltip="" />
+        <el-table-column prop="info18" label="鏉愭枡"  show-overflow-tooltip="" />
+        <el-table-column prop="info6" label="绗嚑鍖�"  show-overflow-tooltip="" />
+        <el-table-column prop="info4" label="閿�鍞悎鍚屽崟鍙�"  show-overflow-tooltip="" />
          <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
          <el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="createUserName" label="鍒涘缓浜�"  show-overflow-tooltip="" />
         <el-table-column prop="updateUserName" label="淇敼浜�"  show-overflow-tooltip="" />
-          <el-table-column prop="upiFlag" label="鏍囪"  show-overflow-tooltip="" >
-            <template #default="scope">
-              <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
-            </template>
-          </el-table-column>
-        <el-table-column prop="info18" label="鏉愭枡"  show-overflow-tooltip="" />
         <el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_BatchOrderUPI_New:update') || auth('mes_BatchOrderUPI_New:delete')">
           <template #default="scope">
             <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_BatchOrderUPI_New(scope.row)" v-auth="'mes_BatchOrderUPI_New:update'"> 缂栬緫 </el-button>

--
Gitblit v1.9.3