实验室运维模块缺陷修改

src/api/operation/hand.js

@@ -311,4 +311,29 @@ export const urgentRepairReject  = (data) =>{
   })
 }
 
+// 维修人员选择设备
+export const getRepairDevice = (id) =>{
+    return request({
+        url:`/api/device/findList?roomId=${id}`,
+        method:'get'
+    })
+}
+
+// 维修人员撤回方案
+export const returnOrder = (data) =>{
+    return request({
+        url:'/api/lab-ops/work-order/return',
+        method:'post',
+        data
+    })
+}
+
+// 客户删除需求单
+export const deleteOrders = (ids) =>{
+    return request({
+        url:`/api/lab-ops/work-order/remove?ids=${ids}`,
+        method:'post'
+    })
+}
+
 

src/views/components/requestSub.vue

@@ -12,8 +12,11 @@
               font-weight: 550;
               color: #000;
               margin: 0px 0 20px;
+              display: flex;
+              justify-content: space-between;
             " v-show="addForm.length > 1">
-                填报{{ index + 1 }}
+               <div> 填报{{ index + 1 }}</div>
+               <div @click="handleDelete(index)"><i class="el-icon-delete" style="color: #409EFF;cursor: pointer;"></i></div>
             </div>
             <avue-form :option="item.formOption" :model="item.form" :ref="`form${index}`"
                 :upload-after="(res, done, loading, column) => { uploadAfter(res, done, loading, column, index) }"
@@ -699,6 +702,20 @@ export default {
                 }
             }
         },
+        // 多个提报时单个删除
+        handleDelete(index){
+            this.$confirm('请确认是否删除该需求填报?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.addForm.splice(index,1)
+                this.$message({
+                type: 'success',
+                message: '删除成功!'
+                });
+            })
+        },
         /* 图片压缩方法-canvas压缩 */
         compressUpload(image, file) {
             const canvas = document.createElement('canvas')

src/views/customerFeedback/feedback.vue

@@ -44,6 +44,9 @@
                     <el-form-item label="联系人" prop="feedUser">
                         <el-input disabled  style="width: 95%;" placeholder="请输入联系人" v-model="receiveForm.feedUser"></el-input>
                     </el-form-item>
+                    <el-form-item label="联系方式" prop="phone">
+                        <el-input disabled  style="width: 95%;" placeholder="请输入联系方式" v-model="receiveForm.phone"></el-input>
+                    </el-form-item>
                 </div>
                 <div>
                     <div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">反馈结果</div>

src/views/system/dept.vue

@@ -80,12 +80,12 @@ export default {
         filterBtn: false,
         column: [
           {
-            label: "机构名称",
+            label: "名称",
             prop: "deptName",
             search: true,
             rules: [{
               required: true,
-              message: "请输入机构名称",
+              message: "请输入名称",
               trigger: "blur"
             }]
           },
@@ -139,7 +139,7 @@ export default {
             }]
           },
           {
-            label: "机构类型",
+            label: "类型",
             type: "select",
             dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
             props: {
@@ -153,7 +153,7 @@ export default {
             search: website.tenantMode,
             rules: [{
               required: true,
-              message: "请输入机构类型",
+              message: "请输入类型",
               trigger: "blur"
             }],
             change: (val) => {
@@ -226,15 +226,15 @@ export default {
   methods: {
     typeChange(val) {
       console.log('value', val)
-      this.option.column.forEach(item => {
-        if (item.prop == 'labAddress' &&val.item.dictKey == 5) {
-          item.display = true
-        }
-        if (item.prop == 'labAddress' &&val.item.dictKey != 5){
-          item.display = false
-        }
-        this.$refs.crud.rowAdd();
-      })
+      // this.option.column.forEach(item => {
+      //   if (item.prop == 'labAddress' &&val.item.dictKey == 5) {
+      //     item.display = true
+      //   }
+      //   if (item.prop == 'labAddress' &&val.item.dictKey != 5){
+      //     item.display = false
+      //   }
+      //   this.$refs.crud.rowAdd();
+      // })
 
     },
 
@@ -247,12 +247,27 @@ export default {
     },
     // 新增子项
     handleAdd(row) {
+      console.log('row--------------->',row)
       this.parentId = row.id;
       const column = this.findObject(this.option.column, "parentId");
 
       column.value = row.id;
       column.addDisabled = true;
 
+      if(row.deptCategory == 0){
+        const column = this.findObject(this.option.column, "deptCategory");
+        column.addDisabled = true;
+        column.value = 5
+      }else if(row.deptCategory == 5){
+        const column = this.findObject(this.option.column, "deptCategory");
+        column.addDisabled = true;
+        column.value = 6
+      }else if(row.deptCategory == 6){
+        const column = this.findObject(this.option.column, "deptCategory");
+        column.addDisabled = true;
+        column.value = 7
+      }
+
       this.$refs.crud.rowAdd();
     },
     rowSave(row, done, loading) {
@@ -268,6 +283,9 @@ export default {
         });
         // 数据回调进行刷新
         done(row);
+        const column = this.findObject(this.option.column, "deptCategory");
+        column.addDisabled = false;
+        column.value = ''
         this.onLoad();
       }, error => {
         window.console.log(error);
@@ -354,14 +372,25 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     beforeOpen(done, type) {
+      this.option.column.forEach(item => {
+          if(item.prop == 'parentId'){
+            item.display = true
+          }
+        })
 
       if (["add", "edit"].includes(type)) {
         this.initData(this.form.tenantId);
       }
+      if(['add'].includes(type)){
+        this.option.column.forEach(item => {
+          if(item.prop == 'parentId' && item.value === ''){
+            item.display = false
+          }
+        })
+      }
       if (["edit", "view"].includes(type)) {
         getDept(this.form.id).then(res => {
           this.form = res.data.data;
-          console.log('类型', this.form.parentId == '0')
           if (this.form.parentId == '0') {
             this.form.parentId = '';
 
@@ -369,12 +398,12 @@ export default {
           // labAddress
 
 
-          this.option.column.forEach(item => {
-            if (item.prop == 'labAddress' && this.form.deptCategory == 5) {
-              item.display = true
-            }
-          })
-          this.$refs.crud.rowAdd();
+          // this.option.column.forEach(item => {
+          //   if (item.prop == 'labAddress' && this.form.deptCategory == 5) {
+          //     item.display = true
+          //   }
+          // })
+          // this.$refs.crud.rowAdd();
 
         });
       }