接口联调

src/api/productionTesting/InspectionTemplate.js

@@ -18,6 +18,14 @@ export const addTemplate = (data) =>{
     })
 }
 
+export const editTemplate = (data) =>{
+    return request({
+        url:'/api/blade-desk/QA/InspectionTemplate/update',
+        method:"post",
+        data
+    })
+}
+
 // 标准下拉
 export const getStandard = (params) =>{
     return request({

src/api/qualityManagement/productionTesting/prPlanTestRec.js

@@ -0,0 +1,19 @@
+import request from '@/axios';
+
+// 获取列表
+export const getList = (params) =>{
+    return request({
+        url:'/api/blade-desk/QA/PlanTest/list',
+        method:'get',
+        params
+    })
+}
+
+// 详情
+export const getDetail = (params) =>{
+    return request({
+        url:'/api/blade-desk/QA/PlanTest/detail',
+        method:'get',
+        params
+    })
+}

src/api/qualityManagement/qualityObjective.js

@@ -107,3 +107,12 @@ export const deleteYear = (params) =>{
         params
     })
 }
+
+// 根据作业中心获取班组
+export const getTeam = (params) =>{
+    return request({
+        url:'/api/blade-desk/BA/TeamSet/listForSelectByWcId',
+        method:"get",
+        params
+    })
+}

src/views/periodicTesting/components/addProjectCycleDialog.vue

@@ -42,10 +42,11 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="镀种：" prop="plateId">
-            <el-select v-model="projectForm.plateId">
+          <el-form-item label="镀种：" prop="plateName">
+            <el-input v-model="projectForm.plateName" placeholder="请输入镀种"></el-input>
+            <!-- <el-select v-model="projectForm.plateId">
               <el-option v-for="item in plateData" :key="item.id"  :label="item.plate" :value="item.id"></el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -72,8 +73,8 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="工艺员：" prop="processUserId">
-            <el-select v-model="projectForm.processUserId" placeholder="请选择工艺员">
+          <el-form-item label="工艺员：" prop="processUserIds">
+            <el-select v-model="projectForm.processUserIds" placeholder="请选择工艺员" :multiple="title == '新增' ? true : false">
               <el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -85,7 +86,7 @@
               v-model="projectForm.testDuration"
               controls-position="right"
               @change="handleChange"
-              :min="1"
+              :min="0"
             >
             </el-input-number>
             <span style="margin-left: 5px">天</span>
@@ -97,7 +98,7 @@
               v-model="projectForm.genBefore"
               controls-position="right"
               @change="handleChange"
-              :min="1"
+              :min="0"
             >
             </el-input-number>
             <span style="margin-left: 5px">天</span>
@@ -110,6 +111,7 @@
               controls-position="right"
               @change="handleChange"
               :min="projectForm.testDuration"
+              :max="Number(projectForm.testDuration) + Number(projectForm.genBefore)"
             >
             </el-input-number>
             <span style="margin-left: 5px">天</span>
@@ -312,8 +314,10 @@ export default {
       projectRules: {
         cycleTestItemId: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
         testType: [{ required: true, message: '请选择试验件', trigger: 'blur' }],
-        processUserId: [{ required: true, message: '请选择工艺员', trigger: 'blur' }],
+        processUserIds: [{ required: true, message: '请选择工艺员', trigger: 'blur' }],
         remind: [{ required: true, message: '请选择超期提醒', trigger: 'blur' }],
+        genBefore: [{ required: true, message: '请选择提前下发', trigger: 'blur' }],
+        testDuration: [{ required: true, message: '请选择试验时长', trigger: 'blur' }],
         jobType: [{ required: true, message: '请选择试验周期', trigger: 'blur' }],
         testMat:[{required:true,message:'请输入试验件材料',trigger:'blur'}],
         minDoTestCount:[{required:true,message:'请输入最小试验数量',trigger:'blur'}],
@@ -345,7 +349,8 @@ export default {
         this.projectForm = {
           ...res.data.data,
           isPutOff:res.data.data.isPutOff == 1 ? true : false,
-          testType:res.data.data.testType != '' ? res.data.data.testType + '' : ''
+          testType:res.data.data.testType != '' ? res.data.data.testType + '' : '',
+          processUserIds:res.data.data.processUserId
         }
         if(this.projectForm.jobType == 1){
           this.projectForm = {
@@ -497,11 +502,10 @@ export default {
             }
             let params = {
               testType:this.projectForm.testType,
-              plateId:this.projectForm.plateId,
+              plateName:this.projectForm.plateName,
               cycleTestItemId:this.projectForm.cycleTestItemId,
               cycleTestItemCondition:this.projectForm.cycleTestItemCondition,
               cycleTestItemStandard:this.projectForm.cycleTestItemStandard,
-              processUserId:this.projectForm.processUserId ? this.projectForm.processUserId : '',
               testDuration:this.projectForm.testDuration ? this.projectForm.testDuration : '',
               genBefore:this.projectForm.genBefore ? this.projectForm.genBefore : '',
               remind:this.projectForm.remind,
@@ -514,9 +518,10 @@ export default {
               testMat:this.projectForm.testMat,
             }
             
-            console.log('params==============',params)
             console.log('title--------------',this.title)
             if(this.title == '新增'){
+              params.processUserIds = this.projectForm.processUserIds.length != 0 ? this.projectForm.processUserIds.join(',') : ''
+              console.log('params==============',params)
               add(params).then(res =>{
                 if(res.data.code == 200){
                     this.$message.success('新增成功')
@@ -524,6 +529,8 @@ export default {
                 }
               })
             }else{
+              params.processUserId = this.projectForm.processUserIds ? this.projectForm.processUserIds : ''
+              console.log('params==============',params)
               params.id = this.projectForm.id
               update(params).then(res =>{
                 if(res.data.code == 200){

src/views/periodicTesting/components/viewDialog.vue

@@ -48,8 +48,8 @@
                 </el-col>
             </el-row>
         </div>
-        <div style="font-weight: 550;" v-if="detailForm.isDone == 1">试验结果</div>
-        <div class="info_box" v-if="detailForm.isDone == 1">
+        <div style="font-weight: 550;" v-if="detailForm.status == 4 || detailForm.status == 9">试验结果</div>
+        <div class="info_box" v-if="detailForm.status == 4 || detailForm.status == 9">
             <el-row class="item_item" :gutter="20" v-if="detailForm.isDone == 1">
                 <el-col :span="6">
                     <span>试验结果：</span>

src/views/periodicTesting/projectCycle.vue

@@ -55,7 +55,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="下发时间" prop="oneTimeGenDate" v-if="title1 == '任务下发'">
+        <!-- <el-form-item label="下发时间" prop="oneTimeGenDate" v-if="title1 == '任务下发'">
           <el-date-picker
             v-model="issueForm.oneTimeGenDate"
             style="width:100%"
@@ -65,7 +65,7 @@
             value-format="YYYY-MM-DD"
             placeholder="请选择下发时间"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <template #footer>
         <span class="dialog-footer">
@@ -330,7 +330,8 @@ export default {
       let date = dateFormat(new Date(),'yyyy-MM-dd')
       this.issueForm = {}
       this.issueForm.cycleTestId = row.id
-      this.issueForm.oneTimeGenDate = date
+      // this.issueForm.oneTimeGenDate = date
+      this.issueForm.processUserId = row.processUserId
       this.issueDialog = true;
     },
     // 点击上方删除按钮，多条删除

src/views/periodicTesting/testTask.vue

@@ -51,13 +51,14 @@
             height: '49px',
             lineHeight: '49px',
             background:
-              row.countDayToPlanedFinish === 0
+              row.countDayToPlanedFinish != '' ?
+              row.countDayToPlanedFinish <= 0
                 ? '#ff0000'
                 : row.countDayToPlanedFinish >= 7
                 ? '#fffd00'
-                : row.countDayToPlanedFinish > 0 && row.countDayToPlanedFinish <= 3
+                : row.countDayToPlanedFinish > 0 && row.countDayToPlanedFinish < 7
                 ? '#ffad00'
-                : '#fff',
+                : '#fff' : '#fff',
           }"
         >
           {{ row.countDayToPlanedFinish }}

src/views/productionTesting/InspectionTemplate.vue

@@ -32,7 +32,7 @@
             {{ row.updateMan.userName}}
         </template>
     </avue-crud>
-    <el-dialog title="项目" append-to-body v-model="showDialog" width="60%">
+    <el-dialog :title="title" append-to-body v-model="showDialog" width="60%">
       <el-form ref="addForm" :rules="formRules" :model="formData" label-width="100px">
         <el-row>
           <el-col :span="12">
@@ -54,7 +54,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <div>
+      <div v-if="title == '新增'">
         <el-button type="primary"   @click="insertEvent()">插入一行</el-button>
         <el-button plain type="danger" @click="remove">删除选择行</el-button>
         <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
@@ -110,7 +110,7 @@
 </template>
 
 <script>
-import {getList,addTemplate,getStandard,getItem,getDetail,getCategory,setType,deleteItem} from '@/api/productionTesting/InspectionTemplate'
+import {getList,addTemplate,getStandard,editTemplate,getItem,getDetail,getCategory,setType,deleteItem} from '@/api/productionTesting/InspectionTemplate'
 export default {
   data(){
     return{
@@ -123,6 +123,7 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      title:'新增',
       search:{},
       showDialog:false,
       setDialog:false,
@@ -561,13 +562,25 @@ export default {
               priority:this.formData.priority,
               detailList:this.tidList.length > 0 ? this.tidList : []
             }
-            addTemplate(params).then(res =>{
-              if(res.data.code == 200){
-                this.$message.success('新增成功')
-                this.showDialog = false
-                this.onLoad()
-              }
-            })
+            if(this.title == '新增'){
+              addTemplate(params).then(res =>{
+                if(res.data.code == 200){
+                  this.$message.success('新增成功')
+                  this.showDialog = false
+                  this.onLoad()
+                }
+              })
+            }else{
+              params.id = this.formData.id
+              editTemplate(params).then(res =>{
+                if(res.data.code == 200){
+                  this.$message.success('修改成功')
+                  this.showDialog = false
+                  this.onLoad()
+                }
+              })
+            }
+            
           }
           // // if(this.tidList)
           // const deleteIdArr = []
@@ -649,6 +662,7 @@ export default {
     },
     handleAdd(){
       this.showDialog = true
+      this.title = '新增'
       this.formData = {}
       this.tidList = []
       this.deleteTidArr = []
@@ -663,6 +677,8 @@ export default {
     editRow(row){
       getDetail({id:row.id}).then(res =>{
         this.formData = res.data.data
+        this.title = '编辑'
+        this.tidList = res.data.data.detailList
         this.showDialog = true
       })
     },

src/views/qualityManagement/qualityObjective/annualTarget.vue

@@ -151,7 +151,7 @@ export default {
           },
           {
             label: '班组',
-            prop: 'tsName',
+            prop: 'teamName',
             // bind: 'bsTeamSet.tsName',
             sortable: true,
             filter: true,

src/views/qualityManagement/qualityObjective/components/addAnnmualEditDialog.vue

@@ -24,7 +24,7 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="作业中心:" prop="workstationId">
-                        <el-select v-model="ruleForm.workstationId" :disabled="flag" placeholder="请选择">
+                        <el-select v-model="ruleForm.workstationId" @change="changeWork" :disabled="flag" placeholder="请选择">
                             <el-option v-for="item in optionsWC" :key="item.id" :label="item.wcName"
                                 :value="item.id" />
                         </el-select>
@@ -33,8 +33,8 @@
                 <el-col :span="8">
                     <el-form-item label="班组:" prop="teamId">
                         <el-select v-model="ruleForm.teamId" :disabled="flag || !ruleForm.workstationId" placeholder="请选择">
-                            <el-option v-for="item in optionsTS" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                            <el-option v-for="item in optionsTS" :key="item.id" :label="item.tsName"
+                                :value="item.id" />
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -68,7 +68,7 @@
     </el-dialog>
 </template>
 <script>
-import {getTypeList,getWorkCenter,addYearData,getYearDetail,editYearData} from '@/api/qualityManagement/qualityObjective'
+import {getTypeList,getWorkCenter,addYearData,getYearDetail,editYearData,getTeam} from '@/api/qualityManagement/qualityObjective'
 export default {
     props: {
         showDialog: {
@@ -142,9 +142,9 @@ export default {
                 workstationId: [
                     { required: true, message: '请选择作业中心', trigger: 'blur' },
                 ],
-                // teamId: [
-                //     { required: true, message: '请选择班组', trigger: 'blur' },
-                // ]
+                teamId: [
+                    { required: true, message: '请选择班组', trigger: 'blur' },
+                ]
             },
             options: [
                 {
@@ -210,6 +210,7 @@ export default {
         this.openShow = this.showDialog
         this.getType()
         this.getWCList()
+        
         if(this.rowId != ''){
             this.getDetail()
         }
@@ -221,8 +222,20 @@ export default {
             }).then(res =>{
                 this.ruleForm = {...res.data.data,indicatorType:res.data.data.indicatorType + ''}
                 this.tableData = res.data.data.monthList
+                this.getTeamList(this.ruleForm.workstationId)
+            })
+        },
+        getTeamList(val){
+            getTeam({
+                wcId:val
+            }).then(res =>{
+                this.optionsTS = res.data.data
             })
         },
+        changeWork(val){
+            this.ruleForm.teamId = ''
+            this.getTeamList(val)
+        },
         changeTarget(){
             let num = 0;
             this.tableData.forEach((item) =>{
@@ -250,7 +263,8 @@ export default {
         submit(){
             this.$refs.ruleFormRef.validate(valid =>{
                 if(valid){
-                    let tmp = this.tableData.find(item => !item.targetValue || item.targetValue == '')
+                    let tmp = this.tableData.find(item =>  item.targetValue === '')
+                    console.log('tmp==============',tmp)
                     if(tmp){
                         this.$message.error('数据请填写完全')
                         return

src/views/qualityManagement/qualityObjective/monthQuota.vue

@@ -27,7 +27,6 @@ import {getMonthList,deleteMonth} from '@/api/qualityManagement/qualityObjective
 export default {
     components: {
         addEditDialog,
-        Table
     },
     data() {
         return {