转岗管理问题修改

src/views/basicData/jobTransferManagement.vue

@@ -47,16 +47,16 @@
         <el-button type="text" @click="individualTakeFun(scope.row)">个人信息</el-button>
       </template>
       <template #dataBirth="scope">
-          {{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
+        {{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
       </template>
       <template #contractDuration="scope">
-          {{ scope.row.contractDuration ?scope.row.contractDuration.substring(0, 10) : ''}}
+        {{ scope.row.contractDuration ? scope.row.contractDuration.substring(0, 10) : '' }}
       </template>
-       <template #joinJobDate="scope">
-          {{ scope.row.joinJobDate ?scope.row.joinJobDate.substring(0, 10) : ''}}
+      <template #joinJobDate="scope">
+        {{ scope.row.joinJobDate ? scope.row.joinJobDate.substring(0, 10) : '' }}
       </template>
-       <template #inJobDate="scope">
-          {{ scope.row.inJobDate ?scope.row.inJobDate.substring(0, 10) : ''}}
+      <template #inJobDate="scope">
+        {{ scope.row.inJobDate ? scope.row.inJobDate.substring(0, 10) : '' }}
       </template>
     </avue-crud>
 
@@ -103,7 +103,14 @@
       </template>
     </el-dialog>
     <!-- 个人信息 -->
-    <el-dialog title="个人信息" append-to-body v-if="personalOpen" v-model="personalOpen" width="60%" border>
+    <el-dialog
+      title="个人信息"
+      append-to-body
+      v-if="personalOpen"
+      v-model="personalOpen"
+      width="60%"
+      border
+    >
       <el-table :data="personData">
         <el-table-column label="姓名" prop="userName" min-width="120" />
         <el-table-column label="工号" prop="userCode" min-width="120" />
@@ -579,7 +586,7 @@ export default {
             labelWidth: 150,
             search: false,
             width: 200,
-             addDisplay: false,
+            addDisplay: false,
             editDisplay: false,
             type: 'date',
             format: 'YYYY-MM-DD HH:mm:ss',
@@ -718,7 +725,6 @@ export default {
             this.showDialog = false;
             this.onLoad(this.page, this.query);
           });
-          
         } else {
           console.log('error submit!!');
           return false;
@@ -862,10 +868,8 @@ export default {
         }
         const ids = idArr.join(',');
         regularization({ ids: ids }).then(res => {
-          if (res.code == 200) {
-            this.$message.success('转正成功');
-            this.onLoad(this.page);
-          }
+          this.$message.success('转正成功');
+          this.onLoad(this.page, this.query);
         });
       });
     },

src/views/changeJobManagement/trainingRecordManagement.vue

@@ -78,7 +78,7 @@
         <el-table-column align="center" label="资料">
           <template #default="scope">
             <!-- attachLink -->
-            <el-button v-if="scope.row.attachLink!=''" type="text" @click="downloadFile(scope.row)">资料下载</el-button>
+            <el-button v-if="scope.row.attachLink!=''||scope.row.attachLink!=null" type="text" @click="downloadFile(scope.row)">资料下载</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -210,7 +210,7 @@ export default {
         addBtn: false,
         labelWidth: 120,
         menu: true,
-        menuWidth: 200,
+        menuWidth: 140,
         dialogWidth: 600,
         dialogClickModal: false,
         searchEnter: true,

src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue

@@ -69,6 +69,7 @@
                 style="width: 100%"
                 clearable
                 filterable
+                @change="batchNoChange(scope.row, scope.$index)"
               >
                 <el-option
                   v-for="item in scope.row.tankList"
@@ -188,6 +189,13 @@ export default {
     }
   },
   methods: {
+    batchNoChange(row, index){
+      let select = this.form.tableData[index].tankList.filter(
+        row => row.id == this.form.tableData[index].batchNo
+      );
+      console.log(select, 'select');
+      this.form.tableData[index].batchNoName = select[0].name;
+    },
     // 切换作业中心
     changeWorkCenter(index) {
       this.form.batchNo = '';

src/views/processManagement/bathRefine/workCenterDevice.vue

@@ -61,11 +61,11 @@ export default {
         delBtnIcon: ' ',
         editBtnIcon: ' ',
         viewBtnText: '详情',
-        labelWidth: 120,
+        labelWidth: 100,
         searchLabelWidth: 120,
         menu: true,
         menuWidth: 120,
-        dialogWidth: 1200,
+        dialogWidth: 450,
         dialogClickModal: false,
         searchEnter: true,
         excelBtn: false,
@@ -82,7 +82,7 @@ export default {
         searchSpan: 6,
         searchMenuPosition: 'right',
         align: 'center',
-
+        span:24,
         column: [
           {
             label: '作业中心',
@@ -116,6 +116,7 @@ export default {
             type: 'select',
             filterable: true,
             clearable: true,
+             span:24,
             // multiple: true,
             search: false,
             sortable: true,

src/views/workLicense/personnelEquipment.vue

@@ -16,30 +16,28 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
-     
       :row-class-name="rowClassName"
     >
-     <!-- :span-method="spanMethod" -->
+      <!-- :span-method="spanMethod" -->
       <template #menu-left>
-        <el-button type="danger" @click="handleDeletes">批量删除</el-button>
         <el-button type="primary" @click="handleMaintain">设备维护</el-button>
+        <el-button type="danger" @click="handleDeletes">批量删除</el-button>
       </template>
       <template #menu-right>
         <el-button type="primary" @click="handleImport">导 入</el-button>
       </template>
       <template #equipmentDate="scope">
-          {{ scope.row.equipmentDate ?scope.row.equipmentDate.substring(0, 10) : ''}}
+        {{ scope.row.equipmentDate ? scope.row.equipmentDate.substring(0, 10) : '' }}
       </template>
-       <template #deviceDueDate="scope">
-          {{ scope.row.deviceDueDate ?scope.row.deviceDueDate.substring(0, 10) : ''}}
+      <template #deviceDueDate="scope">
+        {{ scope.row.deviceDueDate ? scope.row.deviceDueDate.substring(0, 10) : '' }}
       </template>
       <template #dataBirth="scope">
-          {{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
+        {{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
       </template>
       <template #validityPeriodExpire="scope">
-          {{ scope.row.validityPeriodExpire ?scope.row.validityPeriodExpire.substring(0, 10) : ''}}
+        {{ scope.row.validityPeriodExpire ? scope.row.validityPeriodExpire.substring(0, 10) : '' }}
       </template>
-      
     </avue-crud>
     <!-- 设备维护 -->
     <equipmentDialog
@@ -172,7 +170,7 @@ export default {
             overflow: true,
             search: true,
             fixed: 'left',
-            searchLabelWidth:50,
+            searchLabelWidth: 50,
           },
           {
             label: '所属班组',
@@ -247,7 +245,7 @@ export default {
             overflow: true,
             search: false,
           },
-           {
+          {
             label: '设备编号',
             prop: 'deviceCode',
             span: 24,
@@ -297,9 +295,7 @@ export default {
       },
     };
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     // 点击导入按钮
     handleImport() {
@@ -405,7 +401,7 @@ export default {
       if (this.selectionList.length == 0) {
         this.$message.error('请至少选择一条数据');
       } else {
-       // 检查是否所有选中项都有 certificateTypeId
+        // 检查是否所有选中项都有 certificateTypeId
         const invalidItem = this.selectionList.find(
           item => !item.certificateTypeId || item.certificateTypeId === ''
         );

src/views/workLicense/workLicense.vue

@@ -19,8 +19,8 @@
     >
       <!-- :span-method="spanMethod" -->
       <template #menu-left>
-        <el-button type="danger" @click="handleDeletes">批量删除</el-button>
         <el-button type="primary" @click="handleMaintain">证书维护</el-button>
+        <el-button type="danger" @click="handleDeletes">批量删除</el-button>
       </template>
       <template #menu-right>
         <el-button type="primary" @click="handleImport">导 入</el-button>
@@ -42,16 +42,24 @@
       </template>
 
       <template #airworthinessDateExpire="scope">
-        {{ scope.row.airworthinessDateExpire ? scope.row.airworthinessDateExpire.substring(0, 10) : '' }}
+        {{
+          scope.row.airworthinessDateExpire
+            ? scope.row.airworthinessDateExpire.substring(0, 10)
+            : ''
+        }}
       </template>
       <template #astronautDate="scope">
         {{ scope.row.astronautDate ? scope.row.astronautDate.substring(0, 10) : '' }}
       </template>
-        <template #astronautDateExpire="scope">
+      <template #astronautDateExpire="scope">
         {{ scope.row.astronautDateExpire ? scope.row.astronautDateExpire.substring(0, 10) : '' }}
       </template>
       <template #astronautValidityPeriod="scope">
-        {{ scope.row.astronautValidityPeriod ? scope.row.astronautValidityPeriod.substring(0, 10) : '' }}
+        {{
+          scope.row.astronautValidityPeriod
+            ? scope.row.astronautValidityPeriod.substring(0, 10)
+            : ''
+        }}
       </template>
     </avue-crud>
     <!-- 证书维护 -->
@@ -349,7 +357,7 @@ export default {
               },
             ],
           },
-           {
+          {
             label: '宇航有效期(年)',
             prop: 'astronautValidityPeriod',
             span: 24,