Merge remote-tracking branch 'origin/master'

src/views/module_cmms/inspect/modules/InspectForm.vue

@@ -188,6 +188,24 @@ const treeData1 = [
             dataIndex: 'itemname'
           },
           {
+            title:'巡检项类型',
+            align:"center",
+            dataIndex: 'classification',
+            customRender:function (t, r, index) {
+              if (t === '0') return '环境'
+              if (t === '1') return '设备'
+              if (t === '2') return '其他'
+            }
+          },
+          {
+            title:'巡检设备',
+            align:"center",
+            dataIndex: 'equipmentname',
+            customRender:function (t, r, index) {
+              return t?t:'-'
+            }
+          },
+          {
             title:'标准',
             align:"center",
             dataIndex: 'inspectionstandards',
@@ -345,6 +363,8 @@ const treeData1 = [
           // this.model.itemList = props.inspectTcontentItemList
           this.model.itemList = props.inspectTcontentItemList.map(item => {
             item.tcontequiptid = props.equipmentid
+            item.equipmentname = props.equipmentname
+            item.classification = props.classification
             return item
           })
           this.$forceUpdate()

src/views/module_cmms/inspectAbnormalItems/InspectAbnormalItemsList.vue

@@ -94,6 +94,12 @@
           </a-button>
         </template>
 
+        <span slot="unusualstatus" slot-scope="text, record">
+          <a-tag v-if="record.unusualstatus === '0'">{{ text }}</a-tag>
+          <a-tag v-if="record.unusualstatus === '1'" color="orange">{{ text }}</a-tag>
+          <a-tag v-if="record.unusualstatus === '2'" color="red">{{ text }}</a-tag>
+        </span>
+
         <span slot="action" slot-scope="text, record">
           <!-- <a @click="handleEdit(record)">查看</a>
           <a-divider type="vertical" /> -->
@@ -189,7 +195,8 @@
           {
             title:'状态',
             align:"center",
-            dataIndex: 'unusualstatus'
+            dataIndex: 'unusualstatus_dictText',
+            scopedSlots: { customRender: 'unusualstatus' }
           },
           {
             title:'处理人',
@@ -230,6 +237,7 @@
         postAction(this.url.confirm, record).then((res) => {
           if(res.success){
             this.$message.success(res.message);
+            this.loadData();
           }else{
             this.$message.warning(res.message);
           }
@@ -238,10 +246,23 @@
         })
       },
       // 转报修
-      handleTransrepair(){
-        postAction(this.url.transrepair, record).then((res) => {
+      handleTransrepair(record){
+        console.log(record)
+        var obj = {
+          repairname: record.inspectname,
+          equipmentname: record.equipmentname,
+          equipmentid: record.equipmentid,
+          equipmentcode: record.equipmentcode,
+          priority: '0',
+          faultdate: record.itime,
+          faultdesc: '巡检项:' + record.itemname + '-异常',
+          relid: record.id,
+          unusualstatus: '2',
+        }
+        postAction(this.url.transrepair, obj).then((res) => {
           if(res.success){
             this.$message.success(res.message);
+            this.loadData();
           }else{
             this.$message.warning(res.message);
           }

src/views/module_cmms/repairManage/modules/RepairManageForm.vue

@@ -9,18 +9,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input v-model="model.equipmentid" placeholder="请输入设备ID"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentcode">
-              <a-input v-model="model.equipmentcode" placeholder="请输入设备编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
+            <a-form-model-item label="选择设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
+              <j-search-select-tag v-model="model.equipmentid" placeholder="请选择设备" dict="tpm_equipment,equipmentname,id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">