From 1da082138ce384d17b93169cfe108386603e72d0 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 23 七月 2025 08:49:10 +0800
Subject: [PATCH] 修改

---
 src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue |  274 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 146 insertions(+), 128 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
index c754720..e262473 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
@@ -11,26 +11,14 @@
       <el-form :model="state.form" size="default" ref="busRef" :rules="state.rules"    >
         <el-row :gutter="24">
           <el-col :span="24">
-            <el-form-item label="企业名称:" prop="companyName" v-if="state.isAdmin">
-              <el-select
-                  v-model="state.form.companyName"
-                  filterable
-                  remote
-                  :disabled="title == '查看' || title == '编辑' || !state.isAdmin"
-                  @change="selectValueCom"
-                  reserve-keyword
-                  placeholder="请输入企业名称"
-                  remote-show-suffix
-                  :remote-method="getCompanyList"
-                  style="width: 100%"
-
-              >
+            <el-form-item label="企业名称:" prop="companyId" v-if="state.isAdmin">
+              <el-select v-model="state.form.companyId" placeholder="请选择" filterable clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin" @change="selectValueCom">
                 <el-option
                     v-for="item in state.companyList"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.name"
-                />
+                    :value="item.id">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -38,20 +26,21 @@
         <el-row :gutter="24">
           <el-col :span="24">
             <el-form-item label="质量目标:" prop="qualityId" >
-              <el-select
-                  :disabled="title === '查看' || title == '编辑'"
-                  v-model="state.form.qualityId"
-                  placeholder="请选择质量目标"
-                  style="width: 100%"
-                  @change="chooseQuality"
-              >
-                <el-option
-                    v-for="item in state.qualityList"
-                    :key="item.id"
-                    :label="item.message"
-                    :value="item.id"
-                />
-              </el-select>
+                <el-select
+                    :disabled="title === '查看' || title == '编辑'"
+                    v-model="state.form.qualityId"
+                    placeholder="请选择质量目标"
+                    style="width: 100%"
+                    @change="chooseQuality"
+                >
+                  <el-option
+                      v-for="item in state.qualityList"
+                      :key="item.id"
+                      :label="item.message"
+                      :value="item.id"
+                      :title="item.message"
+                  />
+                </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -74,45 +63,99 @@
                 <el-table-column type="index" label="序号"  align="center"></el-table-column>
                 <el-table-column label="目标项目" prop="message" align="center"  />
                 <el-table-column label="目标值" align="center"  >
+<!--                  <template #default="{row,$index}">-->
+<!--                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.num'" :rules="state.rules.num">-->
+<!--                      <el-input :disabled="title === '查看'" type="textarea" v-model="row.num" placeholder="请输入"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </template>-->
                   <template #default="{row,$index}">
-                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.num'" :rules="state.rules.num">
-                      <el-input :disabled="title === '查看'" type="textarea" v-model="row.num" placeholder="请输入"></el-input>
-                    </el-form-item>
+                    <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+                      <el-form-item :prop="'qualityTargets.' + '[' + $index + '].' +'qualityTargetMesses.' + '[' + index + ']' + '.num'" :rules="state.rules.num">
+                        <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.num" placeholder="请输入"></el-input>
+                      </el-form-item>
+
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="实施措施及需要的资源" align="center"  width="180">
+<!--                  <template #default="{row,$index}">-->
+<!--                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.method'" :rules="state.rules.method">-->
+<!--                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.method" placeholder="请输入"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </template>-->
                   <template #default="{row,$index}">
-                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.method'" :rules="state.rules.method">
-                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.method" placeholder="请输入"></el-input>
-                    </el-form-item>
+                    <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+                      <el-form-item :prop="'qualityTargets.' + '[' + $index + '].' +'qualityTargetMesses.' + '[' + index + ']' + '.method'" :rules="state.rules.method">
+                        <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.method" placeholder="请输入"></el-input>
+                      </el-form-item>
+
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="计算/统计方法" align="center"  >
+<!--                  <template #default="{row,$index}">-->
+<!--                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.calculate'" :rules="state.rules.calculate">-->
+<!--                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.calculate" placeholder="请输入"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </template>-->
                   <template #default="{row,$index}">
-                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.calculate'" :rules="state.rules.calculate">
-                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.calculate" placeholder="请输入"></el-input>
-                    </el-form-item>
+                    <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+                      <el-form-item :prop="'qualityTargets.' + '[' + $index + '].' +'qualityTargetMesses.' + '[' + index + ']' + '.calculate'" :rules="state.rules.calculate">
+                        <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.calculate" placeholder="请输入"></el-input>
+                      </el-form-item>
+
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="数据源" align="center"  >
+<!--                  <template #default="{row,$index}">-->
+<!--                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.dataSource'" :rules="state.rules.dataSource">-->
+<!--                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.dataSource" placeholder="请输入"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </template>-->
                   <template #default="{row,$index}">
-                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.dataSource'" :rules="state.rules.dataSource">
-                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.dataSource" placeholder="请输入"></el-input>
-                    </el-form-item>
+                    <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+                      <el-form-item :prop="'qualityTargets.' + '[' + $index + '].' +'qualityTargetMesses.' + '[' + index + ']' + '.dataSource'" :rules="state.rules.dataSource">
+                        <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.dataSource" placeholder="请输入"></el-input>
+                      </el-form-item>
+
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="提供部门" align="center"  >
+<!--                  <template #default="{row,$index}">-->
+<!--                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.departName'" :rules="state.rules.departName">-->
+<!--                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.departName" placeholder="请输入"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </template>-->
                   <template #default="{row,$index}">
-                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.departName'" :rules="state.rules.departName">
-                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.departName" placeholder="请输入"></el-input>
-                    </el-form-item>
+                    <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+                      <el-form-item :prop="'qualityTargets.' + '[' + $index + '].' +'qualityTargetMesses.' + '[' + index + ']'+ '.departName'" :rules="state.rules.departName">
+                        <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.departName" placeholder="请输入"></el-input>
+                      </el-form-item>
+
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="考核频次" align="center"  >
+<!--                  <template #default="{row,$index}">-->
+<!--                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.frequency'" :rules="state.rules.frequency">-->
+<!--                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.frequency" placeholder="请输入"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </template>-->
                   <template #default="{row,$index}">
-                    <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.frequency'" :rules="state.rules.frequency">
-                      <el-input :disabled="title === '查看'"  type="textarea" v-model="row.frequency" placeholder="请输入"></el-input>
-                    </el-form-item>
+                    <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+                      <el-form-item :prop="'qualityTargets.' + '[' + $index + '].'+'qualityTargetMesses.' + '[' + index + ']' + '.frequency'" :rules="state.rules.frequency">
+                        <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.frequency" placeholder="请输入"></el-input>
+                      </el-form-item>
+
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="120" v-if="title !== '查看'" >
+                  <template #default="scope">
+                    <el-button link type="primary"  @click="addObject(scope.row)" >添加</el-button>
+                    <el-button link type="danger"  @click="delObject(scope.row)" >删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -120,24 +163,13 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
-            <el-form-item label="拟制:" prop="fictionName" >
-              <el-select
-                  :disabled="title === '查看'"
-                  v-model="state.form.fictionName"
-                  filterable
-                  remote
-                  @change="selectValue"
-                  reserve-keyword
-                  placeholder="请输入人员名称"
-                  remote-show-suffix
-                  :remote-method="getPeopleList"
-                  style="width: 240px"
-              >
+            <el-form-item label="拟制:" prop="fictionId" >
+              <el-select clearable v-model="state.form.fictionId" :disabled="title =='查看'" filterable  style="width: 100%">
                 <el-option
                     v-for="item in state.peopleList"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.name"
+                    :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -155,24 +187,13 @@
         </el-row>
         <el-row :gutter="24" >
           <el-col :span="12">
-            <el-form-item label="审核:" prop="checkName" >
-              <el-select
-                  :disabled="title === '查看'"
-                  v-model="state.form.checkName"
-                  filterable
-                  remote
-                  @change="selectValue1"
-                  reserve-keyword
-                  placeholder="请输入人员名称"
-                  remote-show-suffix
-                  :remote-method="getPeopleList"
-                  style="width: 240px"
-              >
+            <el-form-item label="审核:" prop="checkId" >
+              <el-select clearable v-model="state.form.checkId" :disabled="title =='查看'" filterable  style="width: 100%">
                 <el-option
                     v-for="item in state.peopleList"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.name"
+                    :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -190,24 +211,13 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
-            <el-form-item label="批准:" prop="ratifyName" >
-              <el-select
-                  :disabled="title === '查看'"
-                  v-model="state.form.ratifyName"
-                  filterable
-                  remote
-                  @change="selectValue2"
-                  reserve-keyword
-                  placeholder="请输入人员名称"
-                  remote-show-suffix
-                  :remote-method="getPeopleList"
-                  style="width: 240px"
-              >
+            <el-form-item label="批准:" prop="ratifyId" >
+              <el-select clearable v-model="state.form.ratifyId" :disabled="title =='查看'" filterable  style="width: 100%">
                 <el-option
                     v-for="item in state.peopleList"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.name"
+                    :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -246,6 +256,7 @@
 const title = ref("");
 const busRef = ref();
 const length = ref()
+const selectPopperClass = "max-width-select";
 const emit = defineEmits(["getList"]);
 const dataRef = ref();
 const state = reactive({
@@ -266,13 +277,13 @@
     qualityTargets:[],
   },
   rules: {
-    companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+    companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
     qualityId: [{ required: true, message: '请选择质量目标', trigger: 'blur' }],
     number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
     serial: [{ required: true, message: '请输入序号', trigger: 'blur' }],
-    fictionName: [{ required: true, message: '请选择拟制', trigger: 'blur' }],
-    ratifyName: [{ required: true, message: '请选择批准人', trigger: 'blur' }],
-    checkName: [{ required: true, message: '请选择审核人', trigger: 'blur' }],
+    fictionId: [{ required: true, message: '请选择拟制', trigger: 'blur' }],
+    ratifyId: [{ required: true, message: '请选择批准人', trigger: 'blur' }],
+    checkId: [{ required: true, message: '请选择审核人', trigger: 'blur' }],
     checkTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
     ratifyTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
     fictionTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
@@ -294,7 +305,7 @@
 
 
 });
-const openDialog = async (type, value) => {
+const openDialog = async (type, value,companyList) => {
   const userInfo = JSON.parse(Cookies.get('userInfo'))
   state.isAdmin = userInfo.userType === 0;
   state.form.companyName = userInfo.companyName
@@ -302,6 +313,7 @@
   if(state.isAdmin){
     state.form.companyId = value.companyId
     state.form.companyName = value.companyName
+    state.companyList = companyList
   }
     await getQualityList()
   title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
@@ -311,9 +323,6 @@
       state.form.companyId = value.companyId
       state.form.companyName = value.companyName
     }
-  }
-  if(state.isAdmin){
-    await   getCompanyList()
   }
   await   getPeopleList()
   dialogVisible.value = true;
@@ -406,35 +415,22 @@
   state.companyList = []
   state.qualityList = []
 }
-const getPeopleList = async (val)=>{
-  if(val){
-    const queryParams = {
-      companyId: state.form.companyId == 0 ? null : state.form.companyId,
-      name: val
-    }
-    const res = await getUser(queryParams)
-    if (res.code == 200) {
-      state.peopleList = res.data.list
-
-    } else {
-      ElMessage.warning(res.message)
-    }
-  }else {
-    const queryParams = {
-      pageNum: 1,
-      pageSize: 10,
-      companyId: state.form.companyId == 0 ? null : state.form.companyId
-    }
-    const res = await getUser(queryParams)
-    if (res.code == 200) {
-      state.peopleList = res.data.list
-
-    } else {
-      ElMessage.warning(res.message)
-    }
-
+const getPeopleList = async ()=> {
+  if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+    return
   }
-}
+  const queryParams = {
+    pageNum: 1,
+    pageSize: 9999,
+    companyId: state.form.companyId
+  }
+  const res = await getUser(queryParams)
+  if(res.code == 200){
+    state.peopleList = res.data.list?res.data.list:[]
+  }else{
+    ElMessage.warning(res.message)
+  }
+};
 const selectValue = (val) => {
   state.peopleList.forEach(item => {
     if(item.name === val){
@@ -463,7 +459,8 @@
     state.form.qualityTargets = res.data.map(item => {
       return {
         id: item.id,
-        message: item.message
+        message: item.message,
+        qualityTargetMesses: [{qualityTargetId: item.id}]
       }
     })
 
@@ -505,7 +502,7 @@
     }
   }else {
     const queryParams = {
-      pageSize: 10,
+      pageSize: 999,
       pageNum: 1,
     }
     const res = await getCompany(queryParams)
@@ -516,6 +513,27 @@
     }
   }
 }
+const addObject = (val) => {
+  console.log('val',state.form.qualityTargets)
+  state.form.qualityTargets.forEach(item => {
+    if(item.id == val.id){
+      item.qualityTargetMesses.push({qualityTargetId: item.id})
+    }
+  })
+
+}
+const delObject = (val) => {
+  state.form.qualityTargets.forEach(item => {
+    if(item.id == val.id){
+      if(item.qualityTargetMesses.length == 1){
+        ElMessage.warning('至少保留一组数据')
+        return
+      }
+      item.qualityTargetMesses.pop()
+
+    }
+  })
+}
 defineExpose({
   openDialog
 });

--
Gitblit v1.9.2