修改用车、设备、分包合同

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-24 15:56:52
+ * @LastEditTime: 2024-07-30 10:39:04
 -->
 <template>
   <div class="app-container">
@@ -967,9 +967,9 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      let isProjectValid = this.validateManual(this.chooseProjectList);
+      // let isProjectValid = this.validateManual(this.chooseProjectList);
       let isDocValid = this.validateDocument(this.form.contractDocument)
-      if (!(isProjectValid || isDocValid)) {
+      if (!isDocValid) {
         // 无效，阻止提交  
         return;
       }
@@ -1059,6 +1059,8 @@ export default {
             })
 
           }
+        }else{
+          this.$message.error('必填项未填写完毕')
         }
       });
     },

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-29 17:04:01
+ * @LastEditTime: 2024-07-30 09:22:25
 -->
 
 <template>
@@ -457,18 +457,6 @@ export default {
           dispatchComment: [
             { required: true, message: '请输入安排用车意见', trigger: 'blur' }
           ],
-          cars: [
-            { required: true, message: '请选择车牌号', trigger: 'change' }
-          ],
-          drivers: [
-            { required: true, message: '请选择驾驶员', trigger: 'blur' }
-          ],
-          returnDate: [
-            { required: true, message: '请选择返回时间', trigger: 'change' }
-          ],
-          kilometers: [
-            { required: true, message: '请输入行驶公里', trigger: 'blur' }
-          ]
         }
       }
     },
@@ -727,7 +715,6 @@ export default {
           drivers.push(d.userId)
         }
         this.$set(this.form, 'drivers', drivers);
-        this.$refs.carForm.validateField('drivers');
       }
       this.openCar = false;
     },

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-07-29 18:01:30
+ * @LastEditTime: 2024-07-30 11:40:54
 -->
 
 <template>
@@ -349,6 +349,7 @@ export default {
         } else {
           this.formTotal = 1;
           let data = res.data;
+          this.form = data;
           if (res.data.devices == null || res.data.devices == undefined || res.data.devices == "") {
             data.devices = []
           } else {
@@ -366,6 +367,7 @@ export default {
           if (res.data.modifyDevices == null || res.data.modifyDevices == undefined || res.data.modifyDevices == "") {
             data.modifyDevices = []
             this.modifyDeviceList = this.deviceList
+            this.form.modifyDevices = data.devices;
           } else {
             data.modifyDevices = data.modifyDevices.split(',');
             let arr = []
@@ -377,8 +379,8 @@ export default {
               })
             }
             data.modifyDevices = arr;
+            this.form.modifyDevices = arr;
           }
-          this.form = data;
           if (data.projectId) {
             getProject(data.projectId).then(response => {
               this.chooseProject = response.data;

oa-ui/src/views/flowable/form/projectProcess/assessWork.vue

@@ -2,20 +2,22 @@
  * @Author: ysh
  * @Date: 2024-07-08 16:16:27
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 18:16:07
+ * @LastEditTime: 2024-07-30 09:34:50
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center" id="scrollToMe">核定工作</h2>
     <el-form :model="form" :disabled="disabled" label-width="100px">
       <el-form-item label="项目任务书：">
-        <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.taskDocument}`)">
-          {{ getFileName(form.taskDocument) }}
-        </el-link>
-        <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.taskDocument}`"
-          :underline="false" target="_blank">
-          <span class="el-icon-download">下载文件</span>
-        </el-link>
+        <div v-if="form.taskDocument">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.taskDocument}`)">
+            {{ getFileName(form.taskDocument) }}
+          </el-link>
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.taskDocument}`"
+            :underline="false" target="_blank">
+            <span class="el-icon-download">下载文件</span>
+          </el-link>
+        </div>
       </el-form-item>
       <el-form-item label="核定工作量：">
         <table class="table" border="1">

oa-ui/src/views/oa/device/index.vue

@@ -15,6 +15,9 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="出厂编号" prop="name">
+        <el-input v-model="queryParams.code" placeholder="请输入出厂编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="设备名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>