From 830cebe9b54ce3f69d146772f9a92b854827c326 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 19 Aug 2024 13:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/projectorder/detail.vue     | 24 ++++++++-----------
 .../src/views/biz/qualityfeedback/detail.vue  | 21 ++++++++--------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue
index cd65ea24..adaf4ced 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue
@@ -265,9 +265,7 @@
         <el-row>
           <el-col>
             <el-card class="hl-incard">
-              <el-col
-                v-if="'update,create,alter'.indexOf(query.active) > -1 "
-              >
+              <el-col v-if="'update,create,alter'.indexOf(query.active) > -1">
                 <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
                   >新增</el-button
                 >
@@ -294,7 +292,7 @@
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.projectSubCode`"
-                        :rules="subFormRules.matCode"
+                        :rules="subFormRules.projectSubCode"
                         class="mb-0px!"
                       >
                         <el-input
@@ -356,7 +354,7 @@
                       >
                         <el-input-number
                           style="width: 100%"
-                          :disabled="detailDisabled "
+                          :disabled="detailDisabled"
                           v-model="row.amount"
                           placeholder="请输入生产数量"
                           :min="0"
@@ -405,8 +403,7 @@
                           clearable
                           class="!w-400px"
                           @change="handleWh(row, $index)"
-                          :disabled="
-                            detailDisabled"
+                          :disabled="detailDisabled"
                         >
                           <el-option
                             v-for="dict in whList"
@@ -426,7 +423,7 @@
                         class="mb-0px!"
                       >
                         <el-input
-                          :disabled="detailDisabled "
+                          :disabled="detailDisabled"
                           v-model="row.remark"
                           placeholder="请输入备注"
                           :class="{ 'alter-class': fieldHasAlterInRow('remark', row) }"
@@ -437,9 +434,8 @@
                   <el-table-column label="操作" align="center" width="150">
                     <template #default="scope">
                       <el-button
-                        v-if="
-                          'update,create,alter'.indexOf(query.active) > -1 "
-                        :disabled="detailDisabled||scope.row.id"
+                        v-if="'update,create,alter'.indexOf(query.active) > -1"
+                        :disabled="detailDisabled || scope.row.id"
                         link
                         type="danger"
                         size="small"
@@ -707,11 +703,11 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const subFormLoading = ref(false) // 子表单的加载中
 const subFormRules = reactive({
-  name: [{ required: true, message: '子项目名称不能为空', trigger: 'blur' }],
+  projectSubCode: [{ required: true, message: '产品编码不能为空', trigger: 'blur' }],
   amount: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
-  unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
   compositionId: [{ required: true, message: '材质不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }]
+  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }]
 })
 
 const fieldHasAlter = (fieldName) => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/detail.vue
index eb9182ff..78aeb549 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/detail.vue
@@ -22,7 +22,7 @@
                 v-model="formData.customerId"
                 @update:newValue="handleSelectedClient"
                 class="!w-260px"
-                :disabled="detailDisabled"
+                :disabled="detailDisabled||formData.status==2"
               />
             </el-form-item>
           </el-col>
@@ -40,7 +40,7 @@
                 v-model="formData.projectSubCode"
                 @click.prevent="openProjectSubDialog"
                 readonly
-                :disabled="detailDisabled"
+                :disabled="detailDisabled||formData.status==2"
               >
                 <template #append
                   ><el-button
@@ -76,7 +76,7 @@
                 class="!w-260px"
                 v-model="formData.feedbackPerson"
                 placeholder="请输入客户反馈人"
-                :disabled="detailDisabled"
+                :disabled="detailDisabled||formData.status==2"
               />
             </el-form-item>
           </el-col>
@@ -86,7 +86,7 @@
                 class="!w-260px"
                 v-model="formData.telephone"
                 placeholder="请输入联系电话"
-                :disabled="detailDisabled"
+                :disabled="detailDisabled||formData.status==2"
               />
             </el-form-item>
           </el-col>
@@ -97,8 +97,8 @@
               <el-input
                 class="!w-260px"
                 v-model="formData.feedbackNum"
-                placeholder="请输入客户反馈人"
-                :disabled="detailDisabled"
+                placeholder="请输入数量"
+                :disabled="detailDisabled||formData.status==2"
               />
             </el-form-item>
           </el-col>
@@ -108,7 +108,7 @@
                 class="!w-260px"
                 v-model="formData.reduceMoney"
                 placeholder="请输入扣款金额"
-                :disabled="detailDisabled"
+                :disabled="detailDisabled||formData.status==2"
               />
             </el-form-item>
           </el-col>
@@ -122,7 +122,7 @@
                 placeholder="请输入扣款原因描述"
                 show-word-limit
                 maxlength="200"
-                :disabled="detailDisabled"
+                :disabled="detailDisabled||formData.status==2"
               />
             </el-form-item>
           </el-col>
@@ -149,8 +149,9 @@
               :on-success="handleSuccess"
               :before-upload="before"
               class="upload-file-uploader"
+              
             >
-              <el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button>
+              <el-button type="primary" :disabled="detailDisabled||formData.status==2">  <Icon icon="ep:upload-filled" />上传 </el-button>
             </el-upload>
           </el-col>
           <el-col>
@@ -474,7 +475,7 @@ onMounted(async () => {
       : active.value === 'Check'
         ? '审核'
         : t('action.' + active.value)
-  console.log('active:', active.value, currentId.value)
+  // console.log('active:', active.value, currentId.value,formData.value.status)
   if ('detail' == active.value || 'Check' == active.value) {
     detailDisabled.value = true
   }