设备相关改动及设备巡检

src/views/em/equipment.vue

@@ -64,12 +64,19 @@
         <el-table-column label="存放位置" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.place }}</template>
         </el-table-column>
-        
         <el-table-column label="备注"  show-overflow-tooltip>
           <template #default="scope">{{ scope.row.description }}</template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="left">
           <template #default="scope">
+            <el-link
+              type="primary"
+              @click="table_record (scope.row)"
+              v-auth="'equipment'"
+            >
+            巡检记录
+            </el-link>
+            <el-divider direction="vertical"></el-divider>
             <el-link
               type="primary"
               @click="table_edit(scope.row)"
@@ -96,9 +103,119 @@
     @success="handleSaveSuccess"
     @closed="dialog.save = false"
   ></save-dialog>
+    <el-drawer
+        title="检定记录"
+        v-model="visibleRecord"
+        :size="1000"
+        destroy-on-close
+        @closed="visibleRecord=false"
+      >
+        <el-container v-loading="loading">
+          <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'" style="position: absolute;z-index: 10;left: 110px;top: 16px;"></el-button>
+          <el-main style="padding: 0 20px 20px 20px">
+            <scTable
+              ref="drawer_table"
+              :apiObj="apiObj2"
+              row-key="id"
+              stripe
+              :params="query2"
+            >
+              <el-table-column type="index" width="50"/>
+              <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column label="巡检时间" prop="inspect_time">
+              </el-table-column>
+              <el-table-column label="巡检结果" prop="result">
+                <template #default="scope">
+                  <span>{{results_[scope.row.result]}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="巡检人" prop="production_date">
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" align="center" width="160px">
+              <template #default="scope">
+                <el-link
+                  type="danger"
+                  @click="record_del(scope.row)"
+                  v-auth="'equipment.delete'"
+                >
+                  删除
+                </el-link>
+              </template>
+            </el-table-column>
+            </scTable>
+          </el-main>
+        </el-container>
+      </el-drawer>
+      <el-dialog title="设备巡检" v-model="visible">
+        <el-form
+          ref="dialogForm"
+          :rules="rules"
+          label-width="100px"
+          :model="form"
+        >
+          <el-row>
+            <el-col :md="12" :sm="24" prop="inspect_time">
+              <el-form-item label="巡检时间">
+                <el-date-picker
+                  v-model="form.inspect_time"
+                  type="datetime"
+                  placeholder="巡检时间"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width:100%"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="巡检人" prop="inspect_user">
+                <span style="display:flex">
+                  <el-input readonly v-model="form.inspect_user_name"></el-input>
+                  <ehsUserSelect :multiple="false" @submit="getReceptionist"/>
+                  </span>
+              </el-form-item>
+              <!-- <el-form-item label="巡检人" prop="inspect_user">
+                <el-select 
+                  v-model="form.inspect_user"
+                  placeholder="巡检人"
+                  clearable
+                  style="width:100%"
+                >
+                  <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                </el-select>
+              </el-form-item> -->
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="巡检结果" prop="result">
+                <el-select style="width: 100%" v-model="form.result" placeholder="巡检结果">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="备注">
+                <el-input v-model="form.note" placeholder="备注"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-footer>
+          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+          <el-button @click="visible = false">取消</el-button>
+        </el-footer>
+      </el-dialog>
 </template>
-    <script>
+<script>
-    import baseInFo from './../../../src/utils/baseJson';
 import saveDialog from "./equipment_form.vue";
 export default {
   name: "rparty",
@@ -109,7 +226,6 @@ export default {
     return {
       dialog: {
         save: false,
-        permission: false,
       },
       apiObj: this.$API.em.equipment.list,
       query: {
@@ -117,6 +233,10 @@ export default {
         page_size:20,
         type:10
       },
+      apiObj2: this.$API.em.einspect.list,
+      query2: {
+        equipment:''
+      },
       selection: [],
       state_: {
           10: '完好',
@@ -124,13 +244,39 @@ export default {
           30: '在修',
           40: '禁用',
         },
-        baseInfo:{}
+        results_:{
+          'pass': '合格',
+          'fail': '不合格',
+        },
+        options:[
+          {id:'pass',name: '合格'},
+          {id:'fail',name: '不合格'}
+        ],
+        form:{},
+        rules: {
+          check_date: [{ required: true, message: "请选择检验时间" }],
+          check_organization: [{ required: true, message: "请填写检定机构" }],
+        },
+        item:{},
+        visible:false,
+        visibleRecord:false,
     };
   },
   mounted(){
-    // console.log(baseInfo)
+    this.getUserList();
   },
   methods: {
+    //获取员工
+    getUserList(){
+      let that = this;
+      this.$API.system.user.list.req({page_size:20,page:1}).then(res=>{
+        that.userList = res.results;
+      });
+    },
+    getReceptionist(data) {
+        this.form.inspect_user=data.id;
+        this.form.inspect_user_name=data.name;
+    },
     //添加
     add() {
       this.dialog.save = true;
@@ -152,6 +298,34 @@ export default {
         this.$refs.saveDialog.open("show",10).setData(row);
       });
     },
+    table_record(row){
+      this.item = row;
+      this.form.equipment = row.id;
+      this.query2.equipment = row.id;
+      this.$nextTick(()=>{
+        this.visibleRecord = true;
+      })
+    },
+    //新增检验
+    record_create(){
+      this.visible = true;
+    },
+    //提交检验
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          this.$API.em.einspect.create.req(this.form).then(res=>{
+            this.visible = false;
+            this.isSaveing = false;
+            this.$message.success("操作成功");
+            this.$refs.drawer_table.refresh();
+          }).catch(()=>{
+            this.isSaveing = false;
+          })
+        }
+      });
+    },
     //删除
     async table_del(row) {
       this.$API.em.equipment.delete

src/views/em/equipment_form.vue

@@ -24,6 +24,7 @@
                 placeholder="所属部门"
                 clearable
                 style="width: 100%"
+                @change="deptChange"
               >
                 <el-option
                 v-for="item in group"
@@ -34,6 +35,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="所属工段">
+              <el-select
+                v-model="form.mgroup"
+                placeholder="所属工段"
+                clearable
+                style="width: 100%"
+              >
+                <el-option
+                v-for="item in mgroups"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :md="12" :sm="24">
             <el-form-item label="设备名称" prop="name">
               <el-input v-model="form.name" placeholder="设备名称"/>
@@ -208,8 +226,13 @@
             </el-form-item>
           </el-col>
           <el-col :md="12" :sm="24">
-            <el-form-item label="管精度等级">
+            <el-form-item label="管理等级">
-              <el-input v-model="form.management_level" placeholder="管精度等级"/>
+              <el-input v-model="form.management_level" placeholder="管理等级"/>
+            </el-form-item>
+          </el-col>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="精度等级">
+              <el-input v-model="form.accuracy_level" placeholder="精度等级"/>
             </el-form-item>
           </el-col>
           <el-col :md="12" :sm="24">
@@ -293,6 +316,7 @@ export default {
       setFiltersVisible: false,
       belong_dept_options: [],
       group: [],
+      mgroups:[],
     };
   },
   mounted() {
@@ -301,7 +325,7 @@ export default {
   methods: {
     //部门数据
     getGroup() {
-      this.$API.system.dept.list.req({ page_size: 3 , type:'dept'}).then(res=>{
+      this.$API.system.dept.list.req({type:'dept'}).then(res=>{
         this.group = res.results;
       });
 		},
@@ -309,7 +333,11 @@ export default {
         this.form.keeper=data.id;
         this.form.keeper_name=data.name
     },
-   
+    deptChange(){
+      this.$API.mtm.mgroup.list.req({ page:0,belong_dept:this.form.belong_dept}).then(res=>{
+        this.mgroups = res;
+      });
+    },
     //显示
     open(mode = "add",type) {
       this.mode = mode;

src/views/em/equipmentc.vue

@@ -172,13 +172,16 @@
               <el-table-column type="index" width="50"/>
               <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
               </el-table-column>
-              <el-table-column label="检定日期" prop="number">
+              <el-table-column label="检定日期" prop="check_date">
               </el-table-column>
-              <el-table-column label="检定结果" prop="model">
+              <el-table-column label="检定结果" prop="result">
+                <template #default="scope">
+                  <span>{{state_[scope.row.result]}}</span>
+                </template>
               </el-table-column>
               <el-table-column label="检定周期（月）" prop="factory" show-overflow-tooltip>
               </el-table-column>
-              <el-table-column label="检定单位" prop="production_date">
+              <el-table-column label="检定单位" prop="check_organization">
               </el-table-column>
               <el-table-column label="操作" fixed="right" align="center" width="160px">
               <template #default="scope">