修改相关bug

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

@@ -571,7 +571,6 @@ export default {
             })
           } else {
             this.form.archiveId = this.taskForm.formId;
-            console.log(this.form);
             addArchive(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-23 17:40:09
+ * @LastEditTime: 2024-06-11 18:20:03
 -->
 <template>
   <div>
@@ -193,7 +193,7 @@
                   <td>
                     <el-input v-model="car.days" placeholder="请输入天数" @change="calculateCarTotal(car)"></el-input>
                   </td>
-                  <td class="carCost">{{ (car.expense).toFixed(2) }}</td>
+                  <td class="carCost">{{ car.expense }}</td>
                 </tr>
                 <tr>
                   <td colspan="5">合计</td>
@@ -232,7 +232,7 @@
                     <el-input v-model="device.days" placeholder="请输入天数"
                       @change="calculateDeviceTotal(device)"></el-input>
                   </td>
-                  <td class="deviceCost">{{ (device.depreciation).toFixed(2) }}</td>
+                  <td class="deviceCost">{{ device.depreciation }}</td>
                 </tr>
                 <tr>
                   <td colspan="5">合计</td>
@@ -556,7 +556,6 @@ export default {
     getProjectContract() {
       listProjectContract({ projectId: this.taskForm.formId }).then(res => {
         if (res.rows) {
-          console.log(res.rows);
           if(res.rows.length == 1){
             getContract(res.rows[0].contractId).then(result=>{
               if (result.data) {
@@ -646,14 +645,14 @@ export default {
       let total1 = Number(car.mileage) * Number(car.distance);
       let total2 = Number(car.dayCost) * Number(car.days);
       let sum = (total1 + total2).toFixed(2);
-      this.$set(car, "depreciation", total2);
+      this.$set(car, "depreciation", total2.toFixed(2));
       this.$set(car, "expense", sum);
       this.getCost("expense", "carCost", this.chooseCar);
       this.getFixCost();
     },
     calculateDeviceTotal(device) {
       let total = Number(device.dayCost) * Number(device.days);
-      this.$set(device, "depreciation", total);
+      this.$set(device, "depreciation", total.toFixed(2));
       this.getCost("depreciation", "deviceCost", this.chooseDevice);
       this.getFixCost();
     },

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

@@ -170,7 +170,6 @@ export default {
     }
   },
   created() {
-    console.log(this.budgetForm);
     this.userLen = this.budgetForm.chooseUser.length + 1;
     this.carLen = this.budgetForm.chooseCar.length + 1;
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;

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

@@ -2,11 +2,20 @@
  * @Author: ysh
  * @Date: 2024-03-27 11:10:26
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-10 14:20:42
+ * @LastEditTime: 2024-06-11 10:54:16
 -->
 <template>
   <div>
     <el-form :inline="true">
+      <el-form-item label="设备状态：">
+        <el-select v-model="queryParams.status" filterable clearable @change="getList">
+          <el-option :value="'0'" label="被领用"></el-option>
+          <el-option :value="'1'" label="可领用"></el-option>
+          <el-option :value="'2'" label="维修中"></el-option>
+          <el-option :value="'3'" label="已停用"></el-option>
+          <el-option :value="'4'" label="已报废"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="设备名称：">
         <el-select v-model="queryParams.name" filterable @change="getList" clearable>
           <el-option v-for="item in nameList" :key="item.name" :label="item.name" :value="item.name">
@@ -23,10 +32,18 @@
     </el-form>
     <el-table ref="chooseCar" :data="list" @selection-change="handleSelectionChange" :row-key="getRowKeys">
       <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+      <el-table-column label="设备状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag :type="statusType(scope.row.status)">
+            {{ statusTypeText(scope.row.status) }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="出厂编号" align="center" prop="code" />
+      <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="brand" />
+      <el-table-column label="存放地址" align="center" prop="place" />
       <el-table-column label="单日成本" align="center" prop="dayCost" />
     </el-table>
     <div style="text-align: right;">
@@ -54,7 +71,8 @@ export default {
     return {
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        type: '仪器设备'
       },
       list: [],
       form: {},
@@ -93,6 +111,40 @@ export default {
     },
     clearChoose() {
       this.$refs.chooseCar.clearSelection();
+    },
+    statusTypeText(row) {
+      if (row == '0') {
+        return '被领用'
+      }
+      if (row == '1') {
+        return '可领用'
+      }
+      if (row == '2') {
+        return '维修中'
+      }
+      if (row == '3') {
+        return '已停用'
+      }
+      if (row == '4') {
+        return '已报废'
+      }
+    },
+    statusType(row){
+      if (row == '0') {
+        return 'warning'
+      }
+      if (row == '1') {
+        return 'success'
+      }
+      if (row == '2') {
+        return 'info'
+      }
+      if (row == '3') {
+        return 'danger'
+      }
+      if (row == '4') {
+        return 'info'
+      }
     }
   }
 }

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

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 10:43:03
+ * @LastEditTime: 2024-06-11 17:11:58
 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <h2 class="text-center">承接合同评审表</h2>
+        <h2 class="text-center"><b>承接合同评审表</b></h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
           <el-row :gutter="20">
@@ -85,7 +85,7 @@
             <table border="1">
               <tr>
                 <td style="width: 50px;">序号</td>
-                <td>工作内容</td>
+                <td style="width:180px">工作内容</td>
                 <td>等级或比例尺</td>
                 <td>单位</td>
                 <td>工作量</td>
@@ -97,7 +97,7 @@
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4 }"
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
@@ -113,7 +113,7 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-input v-model="work.workload" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <el-input-number :controls="false" style="width: 60px" v-model="work.workload" clearable :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
                   <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
@@ -121,7 +121,7 @@
                   </el-date-picker>
                 </td>
                 <td>
-                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
@@ -137,7 +137,7 @@
             <table border="1">
               <tr>
                 <td style="width: 50px;">序号</td>
-                <td>回款条件</td>
+                <td style="width: 250px;">回款条件</td>
                 <td>回款比例（%）</td>
                 <td>回款金额（元）</td>
                 <td>预计时间</td>
@@ -149,14 +149,14 @@
                 </td>
                 <td>
                   <el-input v-model="payment.paymentCondition" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName != '合同拟稿'"></el-input>
+                    :autosize="{ minRows: 4 }" :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input-number :controls="false" v-model="payment.paymentPercentage" clearable
+                  <el-input-number style="width:100px" :controls="false" v-model="payment.paymentPercentage" clearable
                     :disabled="taskName != '合同拟稿'" @change="calculatePaymentAmount(payment)"></el-input-number>
                 </td>
                 <td>
-                  <el-input-number :controls="false" :precision="2" v-model="payment.paymentAmount" clearable
+                  <el-input-number style="width:150px" :controls="false" :precision="2" v-model="payment.paymentAmount" clearable
                     :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
@@ -165,7 +165,7 @@
                   </el-date-picker>
                 </td>
                 <td>
-                  <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                  <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
@@ -178,7 +178,7 @@
               :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="合同备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
+            <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -229,7 +229,7 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4 }"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
                 <td style="text-align:left;" @click="clickFile(comment)">
@@ -303,7 +303,7 @@
               <tr>
                 <td>参与评审人员</td>
                 <td colspan="5">
-                  <el-select v-model="meetingForm.users" multiple clearable style="width:600px"
+                  <el-select v-model="meetingForm.users" multiple filterable clearable style="width:600px"
                     :disabled="taskName != '合同拟稿'">
                     <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
                     </el-option>
@@ -345,7 +345,7 @@
           </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="分管审批意见" prop="remark">
-            <el-input v-model="form.managerComment" type="textarea" placeholder="请输入审批意见"
+            <el-input v-model="form.managerComment" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入审批意见"
               :disabled="taskName != '分管审核'" />
           </el-form-item>
           <el-row>
@@ -367,7 +367,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
-            <el-input v-model="form.signRemark" type="textarea" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
+            <el-input v-model="form.signRemark" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
             <!-- <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" /> -->
@@ -401,11 +401,11 @@
             </div>
           </el-form-item>
         </el-form>
-        <div style="text-align: center;">
+        <div style="text-align: center;" v-if="taskName">
           <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
         </div>
       </el-col>` `
-      <el-col :span="6" :xs="24">
+      <el-col :span="6" :xs="24" v-if="flowDisabled">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
           <div>
@@ -464,11 +464,25 @@ export default {
     formDisabled: {
       type: Boolean,
       default: false
+    },
+    flowDisabled:{
+      type: Boolean,
+      default: true
     }
   },
   computed: {
     ...mapGetters(["userId"]),
   },
+  watch: {
+    'taskForm.formId'(newval) {
+      this.projectloading = true
+      this.getProjectList();
+      this.getDeptList();
+      this.getTenderList();
+      this.getUserList();
+      this.initForm();
+    }
+  },
   name: "Contract",
   data() {
     return {
@@ -580,9 +594,11 @@ export default {
     this.getDeptList();
     this.getTenderList();
     this.getUserList();
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
-      this.flowData = res.data;
-    })
+    if(this.flowDisabled){
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
+    }
   },
   mounted() {
     this.initRules();
@@ -676,12 +692,14 @@ export default {
           });
           listProjectContract({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows) {
+              let list = []
               for (let row of res.rows) {
                 this.projectContractForm.projectIds.push(row.projectId);
                 getProject(row.projectId).then(response => {
-                  this.chooseProjectList.push(response.data)
+                  list.push(response.data)
                 })
               }
+              this.chooseProjectList = list;
               this.projectloading = false;
             }
           })

oa-ui/src/views/flowable/form/components/chooseContract.vue

@@ -68,7 +68,6 @@ export default {
   methods: {
     getList() {
       listContract(this.queryParams).then(response => {
-        console.log(response);
         this.contractList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -85,7 +84,6 @@ export default {
       return row.contractId;
     },
     confirmChoose() {
-      console.log(this.choosePContract);
       this.$emit('choose', this.choosePContract)
     },
   },

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -628,7 +628,6 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               let userId;
-              console.log(this.deptId);
               if (this.deptId == 0) {
                 if (this.form.borrowUsage == 2 || this.form.borrowUsage == 3) {
                   userId = this.publicData.partySecretary

oa-ui/src/views/flowable/form/inProgress/achiData.vue

@@ -149,7 +149,6 @@ export default {
       });
     },
     handleLook(row) {
-      console.log(row);
       this.form= row
       this.openObj.formId = row.archiveId
       getProject(row.projectId).then(res=>{

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-07 14:14:52
+ * @LastEditTime: 2024-06-11 14:15:49
 -->
 
 <template>
@@ -12,7 +12,7 @@
         <el-card>
           <h2 style="text-align: center;">设备申请表</h2>
           <div>
-            <el-form ref="deviceForm" :model="form" label-width="100px" :rules="rules">
+            <el-form ref="deviceForm" :model="form" label-width="120px" :rules="rules">
               <!-- 申请人填写 -->
               <el-divider></el-divider>
               <el-row :gutter="20">
@@ -47,30 +47,31 @@
                 </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                    chooseProject.projectLeaderUser.nickName : ''
-                  }}</el-descriptions-item>
+      chooseProject.projectLeaderUser.nickName : ''
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="设备选择：">
-                <el-select style="width: 100%;" v-model="form.devices" filterable multiple placeholder="请选择" clearable
-                  :disabled="taskName != '设备申请'">
+                <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 + '）' : '') + '📍' + item.place" :value="item.deviceId">
                   </el-option>
                 </el-select>
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true"
+                  :disabled="taskName != '设备申请'">选择设备</el-button>
               </el-form-item>
               <el-form-item label="申领事由：" prop="applyReason">
-                <el-input type="textarea" :rows="2" placeholder="请输入申领事由" v-model="form.applyReason"
+                <el-input type="textarea" :rows="3" placeholder="请输入申领事由" v-model="form.applyReason"
                   :disabled="taskName != '设备申请'">
                 </el-input>
               </el-form-item>
@@ -98,48 +99,49 @@
               <!-- 安排设备意见 -->
               <el-divider></el-divider>
               <el-form-item label-width="120px" label="拟发放设备：">
-                <el-select style="width: 100%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
-                  clearable :disabled="taskName != '安排设备'">
+                <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">
+      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
                   </el-option>
                 </el-select>
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true"
+                  :disabled="taskName != '安排设备'">选择设备</el-button>
               </el-form-item>
-              <el-form-item label="安排设备意见：" prop="dispatchComment" label-width="120px">
-                <el-input type="textarea" :rows="2" placeholder="请输入安排设备意见" v-model="form.dispatchComment"
+              <el-form-item label="安排设备意见：" prop="dispatchComment" label-width="125px">
+                <el-input type="textarea" :rows="3" placeholder="请输入安排设备意见" v-model="form.dispatchComment"
                   :disabled="taskName != '安排设备'">
                 </el-input>
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
                   <el-form-item label="签名：" label-width="120px"
-                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
+                    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 == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
+                    v-if="taskName != '设备申请'">
                     <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
               <!-- 分管审核意见 -->
               <el-divider></el-divider>
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="showFormItem('分管审核')">
-                <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="125px">
+                <el-input type="textarea" :rows="3" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核签名')">
+                  <el-form-item label="签名：" label-width="120px">
                     <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('分管审核签名')">
+                  <el-form-item label="日期：" label-width="120px">
                     <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
                   </el-form-item>
                 </el-col>
@@ -150,13 +152,12 @@
                 <el-select style="width: 100%;" v-model="form.repairDevices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '归还确认'">
                   <el-option v-for="item in modifyDeviceList" :key="item.deviceId" :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 + '）' : '') + '📍' + item.place" :value="item.deviceId">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="备注：" prop="remark" label-width="120px">
-                <el-input type="textarea" :rows="2" placeholder="请输入备注" v-model="form.remark"
+                <el-input type="textarea" :rows="3" placeholder="请输入备注" v-model="form.remark"
                   :disabled="taskName != '归还确认'">
                 </el-input>
               </el-form-item>
@@ -170,7 +171,8 @@
               <el-button type="primary" @click="submit">提交申请</el-button>
             </el-row>
             <el-row style="text-align: center;" v-else>
-              <el-button type="primary" @click="completeApply">{{ taskName == '申请确认' ? "确认" : "完成审批" }}</el-button>
+              <el-button type="primary" @click="completeApply" v-if="taskName">{{ taskName == '申请确认' ? "确认" : "完成审批"
+                }}</el-button>
             </el-row>
           </div>
         </el-card>
@@ -189,6 +191,9 @@
     <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
       <project-choose @chooseProject="confirmProject"></project-choose>
     </el-dialog>
+    <el-dialog title="选择仪器" :visible.sync="openDevice" width="70%" append-to-body>
+      <choose-device @chooseList="confirmDevice"></choose-device>
+    </el-dialog>
   </div>
 </template>
 
@@ -205,12 +210,15 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUserByRole } from "@/api/system/role";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import ChooseDevice from '../budget/components/chooseDevice.vue';
 export default {
   components: {
     flow,
-    projectChoose
+    projectChoose,
+    ChooseDevice
   },
-  props: {
+  props:
+  {
     taskName: {
       type: String,
       required: true
@@ -260,6 +268,7 @@ export default {
       flowData: {},
       isSelect: false,
       openProject: false,
+      openDevice: false,
       rules: {
       },
       deviceList: [],
@@ -512,6 +521,21 @@ export default {
       }
       this.openProject = false
     },
+    confirmDevice(val) {
+      if (val) {
+        let list = []
+        for (let v of val) {
+          list.push(v.deviceId)
+        }
+
+        if (this.taskName == '设备申请') {
+          this.form.devices = list
+        } else if (this.taskName == '安排设备') {
+          this.form.modifyDevices = list
+        }
+      }
+      this.openDevice = false;
+    }
   },
 }
 </script>

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

@@ -102,7 +102,6 @@ export default {
             this.$set(this.form, "projectName", this.projectName);
           } else {
             getProject(this.taskForm.formId).then(res => {
-              console.log(res);
               if (res.data) {
                 this.$set(this.form, "projectNumber", res.data.projectNumber);
                 this.$set(this.form, "projectName", res.data.projectName);

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

@@ -177,7 +177,6 @@ export default {
             this.$set(this.form, "projectName", this.projectName);
           } else {
             getProject(this.taskForm.formId).then(res => {
-              console.log(res);
               if (res.data) {
                 this.$set(this.form, "projectNumber", res.data.projectNumber);
                 this.$set(this.form, "projectName", res.data.projectName);

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

@@ -1069,7 +1069,6 @@ export default {
       if (val.length == 1) {
         this.prOpen = false;
         this.chooseProject = val[0];
-        console.log(val[0]);
         let undertakingDeptName = []
         if (val[0].undertakingDept) {
           let deptArr = val[0].undertakingDept.split(',');

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

@@ -170,9 +170,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+        <div style="text-align: center;" v-if="taskName">
+          <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">

oa-ui/src/views/flowable/task/finished/index.vue

@@ -32,17 +32,21 @@
       <el-table-column label="任务节点" align="center" prop="taskName" />
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
-          <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
-              }}</el-tag></label>
+          <label>{{ scope.row.startUserName }}
+            <el-tag type="info" size="mini">
+              {{ scope.row.startDeptName }}
+            </el-tag>
+          </label>
         </template>
       </el-table-column>
       <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
       <el-table-column label="审批时间" align="center" prop="finishTime" width="180" />
       <el-table-column label="耗时" align="center" prop="duration" width="180" />
-      <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="220" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-tickets"
-            @click="handleFlowRecord(scope.row)">流转记录</el-button>
+            @click="handleFlowRecord(scope.row)">办理进度</el-button>
+          <el-button size="mini" type="text" icon="el-icon-tickets" @click="handleFlowNote(scope.row)">表单信息</el-button>
           <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回
           </el-button>
         </template>
@@ -51,15 +55,27 @@
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
+    <el-dialog title="表单信息" :visible.sync="formOpen" append-to-body width="80%">
+      <condition-display :passingParam="passingParam"></condition-display>
+    </el-dialog>
+    <el-dialog title="流程进度" :visible.sync="detailsOpen" append-to-body width="600px">
+      <el-scrollbar style="height: 600px;">
+        <row-detail :rows="clickRow"></row-detail>
+      </el-scrollbar>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { finishedList, getDeployment, delDeployment, addDeployment, updateDeployment, exportDeployment, revokeProcess } from "@/api/flowable/finished";
 import { getProcessVariables } from "@/api/flowable/definition";
+import ConditionDisplay from '@/views/flowable/form/components/conditionDisplay.vue';
+import RowDetail from '../myProcess/send/rowDetail.vue';
 export default {
   name: "Deploy",
   components: {
+    ConditionDisplay,
+    RowDetail
   },
   data() {
     return {
@@ -100,7 +116,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      passingParam: {},
+      formOpen: false,
+      // 当前点击的行数据
+      clickRow: {},
+      detailsOpen:false
     };
   },
   created() {
@@ -177,17 +198,29 @@ export default {
     },
     /** 流程流转记录 */
     handleFlowRecord(row) {
+      // getProcessVariables(row.taskId).then(res => {
+      //   this.$router.push({
+      //     path: '/flowable/task/finished/detail/index',
+      //     query: {
+      //       procInsId: row.procInsId,
+      //       deployId: row.deployId,
+      //       taskId: row.taskId,
+      //       formId: res.data.formId,
+      //       procDefName: row.procDefName
+      //     }
+      //   })
+      // })
+      this.clickRow = row;
+      this.detailsOpen = true;
+    },
+    // 表单信息
+    handleFlowNote(row) {
       getProcessVariables(row.taskId).then(res => {
-        this.$router.push({
-          path: '/flowable/task/finished/detail/index',
-          query: {
-            procInsId: row.procInsId,
-            deployId: row.deployId,
-            taskId: row.taskId,
-            formId: res.data.formId,
-            procDefName: row.procDefName
-          }
-        })
+        if (res.data) {
+          this.passingParam = row
+          this.passingParam.formId = res.data.formId
+          this.formOpen = true
+        }
       })
     },
     /** 撤回任务 */

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -451,7 +451,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-        console.log(row);
       const ids = row.procInsId || this.ids;// 暂不支持删除多个流程
       this.$confirm('删除后,流程将会取消,是否确定删除?', "警告", {
         confirmButtonText: "确定",

oa-ui/src/views/flowable/task/todo/index.vue

@@ -120,7 +120,6 @@ export default {
                  this.$set(item,'project',name)
                 }
               })
-              console.log(this.todoList);
             }
           })
         }

oa-ui/src/views/oa/contract/contractInfo.vue

@@ -0,0 +1,210 @@
+<template>
+  <div>
+    <div class="box1">
+      <div class="title">合同信息
+        <div class="line"></div>
+      </div>
+      <div class="info">
+        <el-descriptions border style="margin-top: 10px;" :column="3">
+          <el-descriptions-item label="合同编码" label-class-name="my-label">
+            {{ form.contractCode }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同编号" label-class-name="my-label">
+            {{ form.contractNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同金额" label-class-name="my-label">
+            {{ form.amount }}
+          </el-descriptions-item>
+          <el-descriptions-item label="履约保证金" label-class-name="my-label">
+            {{ form.deposit }}
+          </el-descriptions-item>
+          <el-descriptions-item label="拟稿人" label-class-name="my-label">
+            {{ getUserName(form.drafter) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="拟稿日期" label-class-name="my-label">
+            {{ form.draftTime }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同文件" label-class-name="my-label" :span="3">
+            <div v-if="form.contractDocument">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
+                {{ getFileName(form.contractDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+          </el-descriptions-item>
+          <el-descriptions-item label="合同备注" label-class-name="my-label">
+            {{ form.remark }}
+          </el-descriptions-item>
+          <el-descriptions-item label="签订日期" label-class-name="my-label">
+            {{ form.signDate }}
+          </el-descriptions-item>
+          <el-descriptions-item label="签订备注" label-class-name="my-label">
+            {{ form.signRemark }}
+          </el-descriptions-item>
+          <el-descriptions-item label="签订扫描件" label-class-name="my-label" :span="3">
+            <div v-if="form.signScan">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">
+                {{ getFileName(form.signScan) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.signScan}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </div>
+    <div class="box1">
+      <div class="title">投标项目信息
+        <div class="line"></div>
+      </div>
+      <div class="info">
+        <el-descriptions border style="margin-top: 10px;" :column="3">
+          <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">
+            {{ tender.projectName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="招标业主" label-class-name="my-label">
+            {{ tender.partyA }}</el-descriptions-item>
+          <el-descriptions-item label="代理联系人" label-class-name="my-label">
+            {{ tender.aPerson }}</el-descriptions-item>
+          <el-descriptions-item label="代理联系电话" label-class-name="my-label">
+            {{ tender.aPhone }}
+          </el-descriptions-item>
+          <el-descriptions-item label="投标委托人" label-class-name="my-label">
+            {{ getUserName(tender.trustee) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="业主预算" label-class-name="my-label">
+            {{ tender.budget }}
+          </el-descriptions-item>
+          <el-descriptions-item label="拟报价金额" label-class-name="my-label">
+            {{ tender.quote }}
+          </el-descriptions-item>
+          <el-descriptions-item label="保证金" label-class-name="my-label">
+            {{ tender.deposit }}
+          </el-descriptions-item>
+          <el-descriptions-item label="招标文件" label-class-name="my-label" :span="2">
+            <div v-if="tender.bidDocument">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + tender.bidDocument}`)">
+                {{ getFileName(tender.bidDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + tender.bidDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+          </el-descriptions-item>
+          <el-descriptions-item label="项目内容简述" label-class-name="my-label" :span="3">
+            {{ tender.projectBriefly }}
+          </el-descriptions-item>
+          <el-descriptions-item label="标书文件" label-class-name="my-label" :span="3">
+            <div v-if="tender.tenderDocument">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + tender.tenderDocument}`)">
+                {{ getFileName(tender.tenderDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + tender.tenderDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </div>
+    <div class="box1">
+      <div class="title">关联项目
+        <div class="line"></div>
+      </div>
+      <div class="info">
+        
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listTender, getTender } from "@/api/oa/tender/tender";
+import { listContract, getContract } from "@/api/oa/contract/contract";
+import { getContractComment } from "@/api/oa/contract/contractComment";
+import { getContractMeeting } from "@/api/oa/contract/contractMeeting";
+import { getContractPayment } from "@/api/oa/contract/contractPayment";
+import { getContractWork } from "@/api/oa/contract/contractWork";
+export default {
+  props: {
+    form: {
+      type: Object,
+      require: true
+    }
+  },
+  watch: {
+    'form.contractId'() {
+      this.init()
+    }
+  },
+  mounted() {
+    this.init();
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      tender: {}
+    }
+  },
+  methods: {
+    init() {
+      let contractId = this.form.contractId;
+      let tenderId = this.form.tenderId;
+      getTender(tenderId).then(response => {
+        this.tender = response.data;
+      })
+      getContractMeeting(contractId).then(res => {
+      })
+
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+.box1 {
+  width: 100%;
+  background-color: #ffffff;
+}
+
+.info {
+  padding: 20px;
+}
+
+.title {
+  font-size: 18px;
+  font-weight: bold;
+  padding: 20px 35px 0px;
+  position: relative;
+
+  .line {
+    position: absolute;
+    top: 22px;
+    left: 20px;
+    width: 4px;
+    height: 20px;
+    border-radius: 20px;
+    background-color: #409EFF;
+  }
+}
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
+</style>

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-18 09:05:41
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-11 16:35:10
+-->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -47,7 +53,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row> -->
 
-    <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="contractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="合同id" align="center" prop="contractId" /> -->
       <el-table-column label="合同编号" align="center" prop="contractNumber" />
@@ -147,23 +153,19 @@
       </div>
     </el-dialog>
     <!-- 查看详情 -->
-    <el-dialog :title="title" :visible.sync="openInfo" width="600px" append-to-body>
-      <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
-        <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-          <el-link :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`" :underline="false" target="_blank">
-            <span class="el-icon-document"> {{ getFileName(form.contractDocument) }} </span>
-          </el-link>
-        </li>
-      </transition-group>
-      <el-button class="ml20" type="primary" size="mini" plain
-        @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">在线预览</el-button>
+    <el-dialog :title="title" :visible.sync="openInfo" width="80%" append-to-body>
+      <!-- <contract-info :form="form"></contract-info> -->
+      <contract-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></contract-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import contractInfo from './contractInfo.vue';
+import ContractForm from '../../flowable/form/business/contractForm.vue';
 export default {
+  components: { contractInfo, ContractForm },
   name: "Contract",
   data() {
     return {
@@ -207,7 +209,8 @@ export default {
       // 表单校验
       rules: {
       },
-      project: {}
+      project: {},
+      taskForm:{}
     };
   },
   created() {
@@ -282,7 +285,8 @@ export default {
     handleView(row) {
       this.openInfo = true;
       this.title = "合同详情";
-      this.form = row
+      this.form = row;
+      this.$set(this.taskForm,'formId',row.contractId)
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 15:49:07
+ * @LastEditTime: 2024-06-11 16:37:26
 -->
 <template>
   <div class="project-wrapper">
@@ -311,8 +311,6 @@ export default {
               } else {
                 this.$set(project, 'percentage', 0)
               }
-
-              console.log(this.projectList);
             }
           })
         }

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

@@ -204,7 +204,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-              拟报价金额
+              <span class="require_input">* </span>拟报价金额
             </template>
             <el-form-item prop="quote">
               <el-input-number :controls="false" v-model="form.quote"></el-input-number><span> 元</span>
@@ -212,7 +212,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-              保证金
+              <span class="require_input">* </span>保证金
             </template>
             <el-form-item prop="deposit">
               <el-input-number :controls="false" v-model="form.deposit"></el-input-number><span> 元</span>
@@ -286,7 +286,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item>
+          <el-descriptions-item :span="2">
             <template slot="label">
               <span class="require_input">* </span>商务标书要求提交时间
             </template>
@@ -307,7 +307,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item>
+          <el-descriptions-item :span="2">
             <template slot="label">
               <span class="require_input">* </span>技术标书要求提交时间
             </template>
@@ -350,7 +350,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item>
+          <el-descriptions-item :span="3">
             <template slot="label">
               标书文件
             </template>
@@ -463,7 +463,13 @@ export default {
           { required: true, message: '业主预算不能为空', trigger: 'blur' }
         ],
         agent: [
-          { required: true, message: '招标代理不能忘为空', trigger: 'blur' }
+          { required: true, message: '招标代理不能为空', trigger: 'blur' }
+        ],
+        quote: [
+          { required: true, message: '拟保价金额不能为空', trigger: 'blur' }
+        ],
+        deposit: [
+          { required: true, message: '保证金不能为空', trigger: 'blur' }
         ],
         place: [
           { required: true, message: '投标地点不能为空', trigger: 'blur' }