From e66eb61ad006d057fec6b44b5e9f4b6b920c611e Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 26 Aug 2024 15:53:02 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E3=80=81=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/sch/point/index.vue         | 72 +++++++------------
 .../src/views/wms/sch/task/config/index.vue   | 67 +++++++++--------
 2 files changed, 62 insertions(+), 77 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index d829c79..910a6c6 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -175,17 +175,6 @@
         >
           禁用
         </el-button>
-<!--        <el-button
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-info"
-          @click="showConfirmationDialog"
-        >
-          缓存区一键移库
-        </el-button>-->
-        <!-- Confirmation Dialog -->
       </crudOperation>
       <el-dialog
         title="确认"
@@ -280,16 +269,6 @@
           <el-form-item v-if="form.point_status !== '1'" label="子托盘编码" prop="vehicle_code2">
             <el-input v-model="form.vehicle_code2" clearable style="width: 370px;" />
           </el-form-item>
-          <!-- <el-form-item label="可放载具类型" prop="can_vehicle_types">
-            <el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item> -->
           <el-form-item label="载具数量" prop="vehicle_qty">
             <el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
           </el-form-item>
@@ -305,7 +284,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="mysubmit">确认</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -316,21 +295,10 @@
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
         <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
-        <!-- <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" /> -->
         <el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
-        <!--        <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
-        <!--        <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
-        <!-- <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" /> -->
         <el-table-column prop="vehicle_code" label="母托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'母托盘编码')" />
         <el-table-column prop="vehicle_code2" label="子托盘编码" :min-width="flexWidth('vehicle_code2',crud.data,'子托盘编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
-        <!-- <el-table-column prop="product_description" label="物料名称" :min-width="flexWidth('product_description',crud.data,'物料名称')" />
-        <el-table-column prop="supplier_name" label="供应商名称" :min-width="flexWidth('supplier_name',crud.data,'供应商名称')" /> -->
         <el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
           <template slot-scope="scope">
             {{ scope.row.ing_task_code?'是':'否' }}
@@ -364,6 +332,7 @@
               style="display: inline"
               :data="scope.row"
               :permission="permission"
+              :disabled-dle="true"
             />
             <el-button
               v-if="showQtyButton(scope.row.vehicle_qty,scope.row.region_code)"
@@ -374,15 +343,6 @@
             >
               异常出库
             </el-button>
-            <!-- <el-button
-              v-if="showButton(scope.row.point_status)"
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="toView(scope.row)"
-            >
-              查看详情
-            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -587,16 +547,19 @@ export default {
       this.crud.query.point_type = null
       this.crud.query.point_status = null
       this.hand()
-    }, openReasonDialog(row) {
+    },
+    openReasonDialog(row) {
       // 打开选择原因的对话框
       this.reasonDialogVisible = true
       // 这里可以将row存储到data中，以便在提交时使用
       this.selectedRow = row
-    }, closeReasonDialog() {
+    },
+    closeReasonDialog() {
       // 关闭选择原因的对话框
       this.reasonDialogVisible = false
       this.$refs['reasonForm'].resetFields()
-    }, submitReason() {
+    },
+    submitReason() {
       // 提交选择的原因到后端接口
       const data = {
         reason: this.reasonForm.reason,
@@ -617,9 +580,26 @@ export default {
           console.error('提交失败,废包材位有货', error)
           this.$message.error('提交失败,废包材位有货')
         })
-    }, showConfirmationDialog() {
+    },
+    showConfirmationDialog() {
       this.dialogVisible = true
     },
+    mysubmit(){
+      // 弹出输入回温时间和回温模式的对话框
+      this.$confirm('当前货位信息发生变更，请确认货位信息与实际一致', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log('提交')
+        this.crud.submitCU('form')
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
     confirmMove() {
       this.$axios.post('/api/schBaseTask/move', { })
         .then(response => {
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
index 7bf460c..ca262ee 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
@@ -47,6 +47,7 @@
               v-model="form.workshop_code"
               placeholder="请选择"
               style="width: 240px;"
+              disabled
             >
               <el-option
                 v-for="item in workShopList"
@@ -56,16 +57,17 @@
             </el-select>
           </el-form-item>
           <el-form-item label="配置编码" prop="config_code">
-            <el-input v-model="form.config_code" style="width: 240px;" />
+            <el-input v-model="form.config_code" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item label="配置名称">
-            <el-input v-model="form.config_name" style="width: 240px;" />
+            <el-input v-model="form.config_name" disabled style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="任务取放类型">
+          <el-form-item label="任务取放类型" >
             <el-select
               v-model="form.task_qf_type"
               size="mini"
               placeholder="任务取放类型"
+              disabled
               style="width: 240px;"
             >
               <el-option
@@ -80,6 +82,7 @@
               v-model="form.acs_task_type"
               size="mini"
               placeholder="acs任务类型"
+              disabled
               style="width: 240px;"
             >
               <el-option
@@ -90,16 +93,16 @@
             </el-select>
           </el-form-item>
           <el-form-item label="任务名字">
-            <el-input v-model="form.task_name" style="width: 240px;" />
+            <el-input v-model="form.task_name" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item label="任务类型">
-            <el-input v-model="form.task_type" style="width: 240px;" />
+            <el-input v-model="form.task_type" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item label="优先级" pro="priority">
             <el-input-number
               v-model.number="form.priority"
               :min="1"
-              :max="999"
+              :max="100"
               style="width: 240px;"
             />
           </el-form-item>
@@ -107,12 +110,12 @@
             <el-input-number
               v-model.number="form.task_create_max_num"
               :min="1"
-              :max="999"
+              :max="100"
               style="width: 240px;"
             />
           </el-form-item>
           <el-form-item label="是否自动下发">
-            <el-radio-group v-model="form.is_auto_issue" style="width: 240px">
+            <el-radio-group v-model="form.is_auto_issue" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
@@ -121,12 +124,12 @@
             <el-input-number
               v-model.number="form.task_issue_max_num"
               :min="1"
-              :max="999"
+              :max="100"
               style="width: 240px;"
             />
           </el-form-item>
           <el-form-item label="起点区域">
-            <el-select v-model="form.start_region_strs" multiple placeholder="请选择" style="width: 240px;">
+            <el-select v-model="form.start_region_strs" disabled multiple placeholder="请选择" style="width: 240px;">
               <el-option
                 v-for="item in regionList"
                 :key="item.region_code"
@@ -136,7 +139,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="终点区域">
-            <el-select v-model="form.next_region_strs" multiple placeholder="请选择" style="width: 240px;">
+            <el-select v-model="form.next_region_strs" disabled multiple placeholder="请选择" style="width: 240px;">
               <el-option
                 v-for="item in regionList"
                 :key="item.region_code"
@@ -146,16 +149,17 @@
             </el-select>
           </el-form-item>
           <el-form-item label="起点前缀">
-            <el-input v-model="form.start_point_pre" style="width: 240px;" />
+            <el-input v-model="form.start_point_pre" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item label="终点前缀">
-            <el-input v-model="form.next_region_pre" style="width: 240px;" />
+            <el-input v-model="form.next_region_pre" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item label="任务方向" prop="task_direction">
             <el-select
               v-model="form.task_direction"
               size="mini"
               placeholder="任务方向"
+              disabled
               style="width: 240px;"
             >
               <el-option
@@ -166,85 +170,86 @@
             </el-select>
           </el-form-item>
           <el-form-item label="是否校验工单">
-            <el-radio-group v-model="form.is_check_workorder" style="width: 240px">
+            <el-radio-group v-model="form.is_check_workorder" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否判断起点锁">
-            <el-radio-group v-model="form.is_check_start_lock" style="width: 240px">
+            <el-radio-group v-model="form.is_check_start_lock" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否立即创建">
-            <el-radio-group v-model="form.is_immediate_create" style="width: 240px">
+            <el-radio-group v-model="form.is_immediate_create" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否判断终点锁">
-            <el-radio-group v-model="form.is_check_next_lock" style="width: 240px">
+            <el-radio-group v-model="form.is_check_next_lock" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否起点自动">
-            <el-radio-group v-model="form.is_start_auto" style="width: 240px">
+            <el-radio-group v-model="form.is_start_auto" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否终点自动">
-            <el-radio-group v-model="form.is_next_auto" style="width: 240px">
+            <el-radio-group v-model="form.is_next_auto" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否锁定起点">
-            <el-radio-group v-model="form.is_lock_start" style="width: 240px">
+            <el-radio-group v-model="form.is_lock_start" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否锁定终点">
-            <el-radio-group v-model="form.is_lock_next" style="width: 240px">
+            <el-radio-group v-model="form.is_lock_next" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item v-if="false" label="生成任务的请求参数">
-            <el-input v-model="form.request_param" style="width: 240px;" />
+            <el-input v-model="form.request_param" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item v-if="false" label="下发任务的请求参数">
-            <el-input v-model="form.response_param" style="width: 240px;" />
+            <el-input v-model="form.response_param" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item v-if="false" label="是否按组控制下发顺序">
-            <el-radio-group v-model="form.is_group_congrol_issue_seq" style="width: 240px">
+            <el-radio-group v-model="form.is_group_congrol_issue_seq" disabled style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="路由编码" prop="route_plan_code">
-            <el-input v-model="form.route_plan_code" style="width: 240px;" />
+            <el-input v-model="form.route_plan_code" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item label="未完成通知时间" prop="unfinish_notify_time">
             <el-input-number
               v-model.number="form.unfinish_notify_time"
               :min="0"
               :max="999"
+              disabled
               style="width: 240px;"
             />
           </el-form-item>
           <el-form-item v-if="false" label="sql配置">
-            <el-input v-model="form.sql_param" style="width: 240px;" />
+            <el-input v-model="form.sql_param" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item v-if="false" label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
+            <el-input v-model="form.workshop_code" disabled style="width: 240px;" />
           </el-form-item>
           <el-form-item label="备注" prop="remark">
             <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" disabled />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -254,7 +259,6 @@
       </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
         <el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
         <el-table-column prop="config_name" label="配置名称" :min-width="flexWidth('config_name',crud.data,'配置名称')" />
         <el-table-column prop="task_qf_type" label="任务取放类型" :min-width="flexWidth('task_qf_type',crud.data,'任务取放类型')">
@@ -356,6 +360,7 @@
             <udOperation
               :data="scope.row"
               :permission="permission"
+              :disabled-dle="true"
             />
           </template>
         </el-table-column>
@@ -426,9 +431,9 @@ export default {
       idField: 'config_id',
       sort: 'config_id,desc',
       optShow: {
-        add: true,
+        add: false,
         edit: false,
-        del: true,
+        del: false,
         download: false,
         reset: true
       },