修改设备申请

oa-ui/src/views/flowable/form/budget/components/chooseDevice.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-27 11:10:26
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-11 10:54:16
+ * @LastEditTime: 2024-07-15 17:35:10
 -->
 <template>
   <div>
@@ -26,6 +26,9 @@
       <el-form-item label="品牌：">
         <el-input v-model="queryParams.brand" clearable @keyup.enter.native="getList"></el-input>
       </el-form-item>
+      <el-form-item label="出厂编号：">
+        <el-input v-model="queryParams.code" clearable @keyup.enter.native="getList"></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button @click="getList" type="primary">搜索</el-button>
       </el-form-item>

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-21 16:50:43
+ * @LastEditTime: 2024-07-15 17:54:16
 -->
 
 <template>
@@ -61,14 +61,22 @@
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="设备选择：">
-                <el-select style="width: 90%;" v-model="form.devices" filterable multiple placeholder="请选择" clearable
+                <!-- <el-select style="width: 90%;" v-model="form.devices" filterable multiple placeholder="请选择" clearable
                   disabled>
                   <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+      + (item.code != null ? '（设备编号：' + item.code + '）' : '')" :value="item.deviceId">
                   </el-option>
-                </el-select>
+                </el-select> -->
                 <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true"
                   :disabled="taskName != '设备申请'">选择设备</el-button>
+                <el-table :data="deviceList">
+                  <el-table-column label="序号" type="index" />
+                  <el-table-column label="设备品牌" align="center" prop="brand" />
+                  <el-table-column label="设备名称" align="center" prop="name" />
+                  <el-table-column label="规格型号" align="center" prop="series" />
+                  <el-table-column label="出厂编号" align="center" prop="code" />
+                  <el-table-column label="存放地址" align="center" prop="place" />
+                </el-table>
               </el-form-item>
               <el-form-item label="申领事由：" prop="applyReason">
                 <el-input type="textarea" :rows="3" placeholder="请输入申领事由" v-model="form.applyReason"
@@ -99,14 +107,22 @@
               <!-- 安排设备意见 -->
               <el-divider></el-divider>
               <el-form-item label-width="120px" label="拟发放设备：">
-                <el-select style="width: 90%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
+                <!-- <el-select style="width: 90%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
                   clearable disabled>
                   <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
       + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
                   </el-option>
-                </el-select>
+                </el-select> -->
                 <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true"
                   :disabled="taskName != '安排设备'">选择设备</el-button>
+                <el-table :data="modifyDeviceList">
+                  <el-table-column label="序号" type="index" />
+                  <el-table-column label="设备品牌" align="center" prop="brand" />
+                  <el-table-column label="设备名称" align="center" prop="name" />
+                  <el-table-column label="规格型号" align="center" prop="series" />
+                  <el-table-column label="出厂编号" align="center" prop="code" />
+                  <el-table-column label="存放地址" align="center" prop="place" />
+                </el-table>
               </el-form-item>
               <el-form-item label="安排设备意见：" prop="dispatchComment" label-width="125px">
                 <el-input type="textarea" :rows="3" placeholder="请输入安排设备意见" v-model="form.dispatchComment"
@@ -115,14 +131,12 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px"
-                    v-if="taskName != '设备申请'">
+                  <el-form-item label="签名：" label-width="120px" v-if="taskName != '设备申请'">
                     <span class="auditor"> {{ form.dispatchUser ? form.dispatchUser.nickName : dispatchUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px"
-                    v-if="taskName != '设备申请'">
+                  <el-form-item label="日期：" label-width="120px" v-if="taskName != '设备申请'">
                     <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
                   </el-form-item>
                 </el-col>
@@ -232,6 +246,11 @@ export default {
       default: true
     }
   },
+  watch: {
+    'taskForm.formId'() {
+      this.initForm();
+    }
+  },
   created() {
     if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
@@ -244,11 +263,11 @@ export default {
     this.form.user.nickName = this.$store.getters.name;
     this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
-    this.getDeviceList();
-    if(this.flowDisabled)
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
-      this.flowData = res.data;
-    })
+    // this.getDeviceList();
+    if (this.flowDisabled)
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
   },
   data() {
     return {
@@ -277,6 +296,7 @@ export default {
       rules: {
       },
       deviceList: [],
+      grantDeviceList: [],
       modifyDeviceList: [],
       formTotal: 0
     }
@@ -339,8 +359,12 @@ export default {
           } else {
             data.devices = data.devices.split(',');
             let arr = []
+            this.deviceList = []
             for (let d of data.devices) {
-              arr.push(parseInt(d))
+              arr.push(parseInt(d));
+              getDevice(d).then(result => {
+                this.deviceList.push(result.data);
+              })
             }
             data.devices = arr;
           }
@@ -416,8 +440,12 @@ export default {
         });
       } else if (this.taskName == '安排设备') {
         getUsersManageLeader({ userId: this.form.applier }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
+          let userId = [];
+          console.log(res);
+          res.data.forEach(user => {
+            userId.push(user.userId)
+          })
+          this.$set(this.taskForm.variables, "approvalList", userId);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
@@ -524,11 +552,12 @@ export default {
         for (let v of val) {
           list.push(v.deviceId)
         }
-
         if (this.taskName == '设备申请') {
           this.form.devices = list
+          this.deviceList = val;
         } else if (this.taskName == '安排设备') {
           this.form.modifyDevices = list
+          this.modifyDeviceList = val;
         }
       }
       this.openDevice = false;
@@ -539,6 +568,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
+
 ::v-deep .el-input.is-disabled .el-input__inner {
   color: #121212 !important;
 }
@@ -546,5 +576,4 @@ export default {
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
 }
-
 </style>