Merge remote-tracking branch 'origin/project1' into project1

src/views/equipment/boundManagement.vue

@@ -128,7 +128,7 @@
       </div>
     </el-dialog>
     <!-- TODO: 单项详情信息表单配置 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">

src/views/equipment/check.vue

@@ -150,7 +150,7 @@
       </div>
     </el-dialog>
 <!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">
@@ -221,6 +221,7 @@
       :visible.sync="table"
       direction="rtl"
       size="50%"
+      :close-on-click-modal= "false"
        >
       <el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
 
@@ -381,12 +382,8 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        flag: undefined,
         ptype: 1,
-        pstatus:0,
-        delFlag:0
+        pstatus:0
 
       },
       // 表单参数

src/views/equipment/checkProcess.vue

@@ -149,7 +149,7 @@
       </div>
     </el-dialog>
     <!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">
@@ -216,6 +216,7 @@
       :visible.sync="table"
       direction="rtl"
       size="50%"
+      :close-on-click-modal= "false"
     >
       <el-table v-loading="loading" border :data="tableList" style="padding: 0 10px;" @selection-change="handleSelectionChange">
 
@@ -376,13 +377,10 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        rows: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        flag: undefined,
+        rows: 10,  
         ptype: 2,
-        pstatus: 0,
-        delFlag: 0
+        pstatus:0,
+        
 
       },
       // 表单参数

src/views/equipment/equipmentAbandonment.vue

@@ -145,7 +145,7 @@
       </div>
     </el-dialog>
     <!-- TODO: 单项详情信息表单配置 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">
@@ -214,8 +214,20 @@
     <el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
         <el-form-item label="fq_yy" prop="fq_yy">
-          <el-input v-model.trim="abandonFrom.fq_yy"  :maxlength="100" placeholder="请输入fq_yy" />
-        </el-form-item>
+        <el-select
+        v-model.trim="abandonFrom.fq_yy"
+          clearable
+          placeholder="请选择fq_yy"
+          
+        >
+          <el-option
+            v-for="(dict,index) in pgxList"
+            :key="index"
+            :label="dict.dictValue"
+            :value="dict.dictLabel"
+          />
+        </el-select>
+      </el-form-item>
         <el-form-item label="fq_bz" prop="fq_bz">
           <el-input v-model.trim="abandonFrom.fq_bz"  :maxlength="100" placeholder="请输入fq_bz" />
         </el-form-item>
@@ -255,7 +267,7 @@ import {
   updateRole
 } from '@/api/system/role'
 import {listCheck, abandon} from '@/api/equipment/check'
-import {delEquipment} from  '../../api/equipment/equipmentAbandonment'
+import { getDictData } from '@/api/equipment/application'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -276,6 +288,7 @@ export default {
         pstatus: '1'
 
       },
+      pgxList:[],
       abandonFromRules: {
         fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
         fq_yy: [{  required: true, message: '请输入fq_yy', trigger: 'change' }],
@@ -383,13 +396,10 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        rows: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        flag: undefined,
-        ptype:2,
+        rows: 10,  
+        ptype: 2,
         pstatus:0,
-        delFlag:0
+       
       },
       // 表单参数
       form: {
@@ -432,6 +442,7 @@ export default {
       this.queryParams = { ...param }
     }
     this.getList()
+    this.getDict()
     // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
     //   this.statusOptions = response.data;
     // });
@@ -468,6 +479,17 @@ export default {
       }
       
     },
+    getDict() {
+      const obj = {
+        key: 'FQ_CODE'
+      }
+      getDictData(obj).then(res => {
+        console.log('res', res)
+        if (res.code === 200 && res.data !== null) {
+          this.pgxList = res.data
+        }
+      })
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = this.formReset
@@ -636,7 +658,8 @@ export default {
       this.queryParams={
         page: 1,
         rows: 10,
-        ptype: 2
+        ptype: 2,
+        pstatus:0,
       }
       this.resetForm('queryForm')
       this.handleQuery()

src/views/equipment/management.vue

@@ -145,7 +145,7 @@
       </div>
     </el-dialog>
     <!-- TODO: 单项详情信息表单配置 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">

src/views/processManagement/basicProcessManagement/index.vue

@@ -101,7 +101,7 @@
     />
 
     <!-- 添加或修改设备配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="名称" prop="roleName">
           <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
@@ -135,7 +135,7 @@
       </div>
     </el-dialog>
     <!-- TODO: 单项详情信息表单配置 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">

src/views/processManagement/deviceReuse/index.vue

@@ -7,43 +7,43 @@
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="pn:" style="flex-basis: 50%;" prop="pn">
-            <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
+            <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="lot:" style="flex-basis: 50%;" prop="lot">
-            <el-input ref="input2" v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" />
+            <el-input ref="input2" v-model="form.lot" placeholder="请输入lot" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="位置:" style="flex-basis: 50%;" prop="plocation">
-            <el-input ref="input3" v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(3,$event)" />
+            <el-input ref="input3" v-model="form.plocation" placeholder="请输入位置" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(3,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
-            <el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />
+            <el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="psm:" style="flex-basis: 50%;" prop="psm">
-            <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" />
+            <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
-            <el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(6,$event)" />
+            <el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(6,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12" style="padding-left: 8.6%;">
           <el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
-            <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(7,$event)" />
+            <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(7,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">

src/views/sample/sampleType/index.vue

@@ -130,13 +130,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="pn" prop="pn">
-          <el-input v-model.trim="form.pn" :maxlength="100" placeholder="请输入pn" />
+          <el-input v-model.trim="form.pn" clearable :maxlength="100" placeholder="请输入pn" />
         </el-form-item>
         <el-form-item label="dname" prop="dname">
-          <el-input v-model.trim="form.dname" :maxlength="100" placeholder="请输入dname" />
+          <el-input v-model.trim="form.dname" clearable :maxlength="100" placeholder="请输入dname" />
         </el-form-item>
         <el-form-item label="dno" prop="dno">
-          <el-input v-model.trim="form.dno" :maxlength="100" placeholder="请输入dno" />
+          <el-input v-model.trim="form.dno" clearable :maxlength="100" placeholder="请输入dno" />
         </el-form-item>
 <!--        <el-form-item label="remarks" prop="remarks">-->
 <!--          <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->