diff --git a/src/views/inboundOutboundManagement/components/addEditDialog.vue b/src/views/inboundOutboundManagement/components/addEditDialog.vue
index cbd54b04..73b70237 100644
--- a/src/views/inboundOutboundManagement/components/addEditDialog.vue
+++ b/src/views/inboundOutboundManagement/components/addEditDialog.vue
@@ -284,7 +284,7 @@ export default {
         { warehousingReason: 4, value: '领用入库' },
         // { warehousingReason: 5, value: '料头入库' },
         { warehousingReason: 6, value: '物料入库' },
-        { warehousingReason: 7, value: '生产入库' },
+        { warehousingReason: 7, value: '玻璃饼入库' },
       ],
       keeperList: [],
       wareList: [],
@@ -409,6 +409,11 @@ export default {
         goodsCode:this.tableData[index].goodsCode,
       }).then(res => {
         console.log('res--------', res);
+         this.tableData[index].printMark = res.data.data.printMark;
+        this.tableData[index].powderWeight = res.data.data.powderWeight;
+        this.tableData[index].materialNo = res.data.data.materialNo;
+        this.tableData[index].thickness = res.data.data.thickness;
+        // this.tableData[index].glassPieList = res.data.data;
       });
     },
     submit() {
diff --git a/src/views/logisticsManagement/siteBasic.vue b/src/views/logisticsManagement/siteBasic.vue
index 37c1990b..0bdb471b 100644
--- a/src/views/logisticsManagement/siteBasic.vue
+++ b/src/views/logisticsManagement/siteBasic.vue
@@ -23,10 +23,11 @@
       </template>
       <template #menu-right> </template>
       <template #menu="scope">
-        <el-button v-if="permission.site_inIdle&&s(cope.row.stationStatus == '0'||scope.row.stationStatus == '2')" type="text" @click="handleEdit(scope.row)"
+        
+        <el-button v-if="permission.site_inIdle&&(scope.row.stationStatus == 0||scope.row.stationStatus == 2)" type="text" @click="handleEdit(scope.row)"
           >占用</el-button
         >
-        <el-button v-if="permission.site_occupation&&(scope.row.stationStatus == '1')" type="text" @click="handleEdit(scope.row)"
+        <el-button v-if="permission.site_occupation&&(scope.row.stationStatus == 1)" type="text" @click="handleEdit(scope.row)"
           >闲置</el-button
         >
       </template>
diff --git a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue b/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
index 9b8af9b8..cf0ad752 100644
--- a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
+++ b/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 = {
diff --git a/src/views/qualityManagement/tankSolutionSystem/info.vue b/src/views/qualityManagement/tankSolutionSystem/info.vue
index 977aed16..5d79fc22 100644
--- a/src/views/qualityManagement/tankSolutionSystem/info.vue
+++ b/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) {
diff --git a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
index 78083d17..a93a7bb3 100644
--- a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
+++ b/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) {
diff --git a/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue b/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue
index 352b56dd..39fede92 100644
--- a/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue
+++ b/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: {
diff --git a/src/views/warehouseManagement/workwearPlan/index.vue b/src/views/warehouseManagement/workwearPlan/index.vue
index f4cee7b9..1f8e2926 100644
--- a/src/views/warehouseManagement/workwearPlan/index.vue
+++ b/src/views/warehouseManagement/workwearPlan/index.vue
@@ -64,21 +64,21 @@
               ></el-option>
             </el-select> -->
             <jhSelect
-                v-model="scope.row.moCode"
-                placeholder="请搜索选择"
-                api-url="/blade-wms/stGoods/list"
-                echo-api="/blade-wms/stGoods/list"
-                echoParamsKey="goodsCode"
-                echo-method="get"
-                api-method="get"
-                list-key="records"
-                total-key="total"
-                label-key="goodsCode"
-                value-key="id"
-                search-key="goodsCode"
-                :debounce-time="100"
-                @change="(val, item) => changeMoData(val, item, scope.row, scope.$index)"
-              />
+              v-model="scope.row.moCode"
+              placeholder="请搜索选择"
+              api-url="/blade-wms/stGoods/list"
+              echo-api="/blade-wms/stGoods/list"
+              echoParamsKey="goodsCode"
+              echo-method="get"
+              api-method="get"
+              list-key="records"
+              total-key="total"
+              label-key="goodsCode"
+              value-key="goodsCode"
+              search-key="goodsCode"
+              :debounce-time="100"
+              @change="(val, item) => changeMoData(val, item, scope.row, scope.$index)"
+            />
           </template>
         </el-table-column>
         <el-table-column align="center" label="工装名称" prop="moName"></el-table-column>
@@ -418,7 +418,7 @@ export default {
 
           {
             label: '保管员',
-            prop: 'keeper',
+            prop: 'keeperName',
             search: false,
             sortable: true,
             overHidden: true,
@@ -469,6 +469,25 @@ export default {
             overHidden: true,
             width: 200,
             searchOrder: 20,
+            type: 'select',
+            dicData: [
+              {
+                label: '新建',
+                value: 1,
+              },
+              {
+                label: '已申请',
+                value: 2,
+              },
+              {
+                label: '已完成',
+                value: 3,
+              },
+              {
+                label: 'erp已删除',
+                value: 4,
+              },
+            ],
             rules: [
               {
                 required: true,