槽液模块修改

src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue

@@ -394,6 +394,7 @@ export default {
                     drugMaterialId:res.data.data.drugMaterialId + '',
                     workCenterId:res.data.data.workCenterId + '',
                     testUserId:res.data.data.testUserId + '',
+                    processUserId:res.data.data.processUserId + '',
                 }
                 if(this.form.jobType == 1){
                     this.form = {

src/views/qualityManagement/tankSolutionSystem/info.vue

@@ -111,7 +111,9 @@ export default {
                 '1', '2', '3', '4', '5', '6',
                 '7', '8', '9', '10', '11', '12', , '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'
             ],
-            query:{},
+            query:{
+                descs:'UPDATE_TIME'
+            },
             isShowImport:false,
             excelBox: false,
             loading: false,
@@ -795,7 +797,9 @@ export default {
             this.$refs.crud.toggleSelection();
         },
         searchReset() {
-            this.query = {};
+            this.query = {
+                descs:"UPDATE_TIME"
+            };
             this.onLoad(this.page);
         },
         searchChange(params, done) {

src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue

@@ -122,7 +122,9 @@ export default {
             formRules: {
                 userId: [{ required: true, message: '请选择检测员', trigger: 'blur' }],
             },
-            query: {},
+            query: {
+                descs:"CREATE_TIME"
+            },
             loading: true,
             issueForm: {},
             option: {
@@ -660,7 +662,9 @@ export default {
             this.issueDialog = true
         },
         searchReset() {
-            this.query = {};
+            this.query = {
+                descs:"CREATE_TIME"
+            };
             this.onLoad(this.page);
         },
         searchChange(params, done) {

src/views/qualityManagement/tankSolutionSystem/workTankLine.vue

@@ -17,7 +17,7 @@
             </template>
         </avue-crud>
         <el-dialog title="生成曲线" append-to-body v-model="lineBox" fullscreen width="70%">
-            <el-form :inline="true" v-model="lineForm" label-width="80px">
+            <el-form :inline="true" ref="lineForm" :model="lineForm" :rules="lineRules" label-width="80px">
                 <el-row :gutter="24">
                     <el-col :span="6">
                         <el-form-item label="作业中心" prop="wcId">
@@ -108,6 +108,10 @@ export default {
             form: {},
             query: {},
             lineForm: {},
+            lineRules:{
+                wcId:[{ required: true, message: '请选择作业中心', trigger: 'blur' }],
+                timeRange:[{ required: true, message: '请选择时间范围', trigger: 'blur' }],
+            },
             nameForm: {},
             detailBox: false,
             detailForm: {},
@@ -262,17 +266,21 @@ export default {
             this.lineBox = true
         },
         createLine(){
-            createLineList({
-                workCenterId:this.lineForm.wcId,
-                createTimeStart:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[0] ,
-                createTimeEnd:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[1] ,
-            }).then(res =>{
-                console.log('res--------------',res)
-                this.isShowBox = true
-                this.lineData = res.data.data.waveData
-                this.$nextTick(() =>{
-                    this.createChart()
-                })
+            this.$refs.lineForm.validate(valid => {
+                if (valid) {
+                    createLineList({
+                        workCenterId:this.lineForm.wcId,
+                        createTimeStart:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[0] ,
+                        createTimeEnd:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[1] ,
+                    }).then(res =>{
+                        console.log('res--------------',res)
+                        this.isShowBox = true
+                        this.lineData = res.data.data.waveData
+                        this.$nextTick(() =>{
+                            this.createChart()
+                        })
+                    })
+                }
             })
         },
 
@@ -443,7 +451,7 @@ export default {
 
                 const option = {
                     title: {
-                        text: item.workTankName + item.testElement,
+                        text: item.workTankName ? item.workTankName + item.testElement : item.testElement,
                         left: "center",
                     },
                     legend: {