修改分包合同查看按钮

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-06-19 16:18:08
+ * @LastEditTime: 2024-06-19 18:38:28
 -->
 <!--
  * @Author: ysh
@@ -401,7 +401,7 @@
           <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>
@@ -462,12 +462,23 @@ export default {
     formDisabled: {
       type: Boolean,
       default: false
+    },
+    flowDisabled: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
     ...mapGetters(["userId"]),
   },
   name: "SubContract",
+  watch: {
+    'taskForm.formId'() {
+      this.chooseProjectList = []
+      this.initRules();
+      this.initForm();
+    }
+  },
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -606,9 +617,10 @@ export default {
     this.getDeptList();
     this.getUserList();
     this.getList();
-    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();

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

@@ -56,16 +56,18 @@
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column label="评审方式" align="center" prop="commentType" >
+      <el-table-column label="评审方式" align="center" prop="commentType">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.commentType == '2' ? 'success':'warning'">
+          <el-tag :type="scope.row.commentType == '2' ? 'success' : 'warning'">
             {{ setCommentType(scope.row.commentType) }}
           </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-          v-hasPermi="['oa:subContract:query']">查看</el-button>
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:subContract:query']">查看</el-button>
+        </template>
       </el-table-column>
     </el-table>
 
@@ -118,16 +120,18 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="openInfo" append-to-body>
-      
+    <el-dialog :title="title" :visible.sync="openInfo" append-to-body width="70%">
+      <sub-contract :taskForm="taskForm" :flowDisabled="false"></sub-contract>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+import subContract from '../../flowable/form/business/subContract.vue';
 
 export default {
+  components: { subContract },
   name: "SubContract",
   data() {
     return {
@@ -150,6 +154,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openInfo: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -170,6 +175,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+      },
+      taskForm: {
+        formId: ''
       }
     };
   },
@@ -284,12 +292,12 @@ export default {
         ...this.queryParams
       }, `subContract_${new Date().getTime()}.xlsx`)
     },
-    setCommentType(commentType){
-      if(commentType == '2'){
+    setCommentType(commentType) {
+      if (commentType == '2') {
         return '线上评审'
-      }else if (commentType == '0'){
+      } else if (commentType == '0') {
         return '无须评审'
-      }else{
+      } else {
         return '会议评审'
       }
     }

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

@@ -42,6 +42,7 @@
 
     <el-table v-loading="loading" :data="partnerList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="单位编号" align="center" prop="partnerId"   />
       <el-table-column label="单位名称" align="center" prop="partnerName" width="200px" />
       <el-table-column label="联系人" align="center" prop="contactPerson" />
       <el-table-column label="联系电话" align="center" prop="telephone" />
@@ -54,8 +55,6 @@
       <el-table-column label="备注说明" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)"
-            v-hasPermi="['oa:partner:view']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:partner:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -68,37 +67,44 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc合作单位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单位名称" prop="partnerName">
-          <el-input v-model="form.partnerName" placeholder="请输入单位名称" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="contactPerson">
-          <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="telephone">
-          <el-input v-model="form.telephone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="资质等级" prop="qualification">
-          <el-input v-model="form.qualification" placeholder="请输入资质等级" />
-        </el-form-item>
-        <el-form-item label="内业规模" prop="inWorker">
-          <el-input v-model="form.inWorker" placeholder="请输入内业规模" />
-        </el-form-item>
-        <el-form-item label="外业规模" prop="outWorker">
-          <el-input v-model="form.outWorker" placeholder="请输入外业规模" />
-        </el-form-item>
-        <el-form-item label="主要技术装备" prop="equipment">
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-row>
+          <el-col :span="12" :gutter="20">
+            <el-form-item label="单位名称" prop="partnerName">
+              <el-input v-model="form.partnerName" placeholder="请输入单位名称" />
+            </el-form-item>
+            <el-form-item label="主要联系人" prop="contactPerson">
+              <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
+            </el-form-item>
+            <el-form-item label="联系电话" prop="telephone">
+              <el-input v-model="form.telephone" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="资质等级" prop="qualification">
+              <el-input v-model="form.qualification" placeholder="请输入资质等级" />
+            </el-form-item>
+            <el-form-item label="内业规模" prop="inWorker">
+              <el-input v-model="form.inWorker" placeholder="请输入内业规模" />
+            </el-form-item>
+            <el-form-item label="外业规模" prop="outWorker">
+              <el-input v-model="form.outWorker" placeholder="请输入外业规模" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="主要技术装备" prop="equipment" label-width="120px">
           <el-input v-model="form.equipment" placeholder="请输入主要技术装备" />
         </el-form-item>
-        <el-form-item label="擅长业务方向" prop="strength">
+        <el-form-item label="擅长业务方向" prop="strength" label-width="120px">
           <el-input v-model="form.strength" placeholder="请输入擅长业务方向" />
         </el-form-item>
-        <el-form-item label="履约能力评价" prop="fulfill">
+        <el-form-item label="履约能力评价" prop="fulfill" label-width="120px">
           <el-input v-model="form.fulfill" placeholder="请输入履约能力评价" />
         </el-form-item>
-        <el-form-item label="备注说明" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注说明" />
+        <el-form-item label="备注说明" prop="remark" label-width="120px">
+          <el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 4, maxRows: 10 }"
+            placeholder="请输入备注说明" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -212,7 +218,7 @@ export default {
       this.open = true;
       this.title = "添加合作单位";
     },
-    handleView(row){
+    handleView(row) {
       const partnerId = row.partnerId || this.ids
       getPartner(partnerId).then(response => {
         this.form = response.data;
@@ -252,7 +258,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const partnerIds = row.partnerId || this.ids;
-      this.$modal.confirm('是否确认删除cmc合作单位编号为"' + partnerIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除"' + row.partnerName + '"？').then(function () {
         return delPartner(partnerIds);
       }).then(() => {
         this.getList();