bug

src/views/purchasingManage/purchaseOrder/invoiceConfirm/components/addInvoiceDialog.vue

@@ -12,7 +12,23 @@
     :maxable="true"
     :resizable="true"
   >
+    <div class="switch" v-if="title == '详情'">
+      <div class="switch_left">
+        <ul>
+          <li
+            v-for="item in tabOptions"
+            :key="item.key"
+            :class="{ active: activeComp == item.key }"
+            @click="activeComp = item.key"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
+
     <el-form
+      v-show="activeComp == 'main'"
       ref="form"
       :model="form"
       :rules="rules"
@@ -21,19 +37,32 @@
     >
       <headerTitle title="收货确认单信息"></headerTitle>
       <el-row :gutter="12">
+        <el-col :span="12" v-if="title != '新增收货确认单'">
+          <el-form-item label="收货确认单编码" prop="receiveConfirmNo">
+            <el-input
+              v-model="form.receiveConfirmNo"
+              :disabled="true"
+              placeholder=" "
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="收货单" prop="receiveCode">
             <el-input
               clearable
               v-model="form.receiveCode"
               @click.native="handleOrderBtn"
+              :disabled="title == '详情'"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item prop="repliedFiles" label="回执附件">
-            <fileMain v-model="form.repliedFiles"></fileMain>
+            <fileMain
+              v-model="form.repliedFiles"
+              :type="title == '详情' ? 'view' : 'add'"
+            ></fileMain>
           </el-form-item>
         </el-col>
       </el-row>
@@ -88,8 +117,9 @@
         </el-col>
       </el-row>
     </el-form>
-    <headerTitle title="物品清单"></headerTitle>
+    <headerTitle title="物品清单" v-show="activeComp == 'main'"></headerTitle>
     <ele-pro-table
+      v-show="activeComp == 'main'"
       ref="table"
       :needPage="false"
       :columns="columns"
@@ -103,7 +133,11 @@
         <fileMain v-model="row.technicalDrawings" type="view"></fileMain>
       </template>
       <template v-slot:isException="scope">
-        <el-select v-model="scope.row.isException" placeholder="请选择">
+        <el-select
+          v-model="scope.row.isException"
+          :disabled="title == '详情'"
+          placeholder="请选择"
+        >
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -116,6 +150,7 @@
 
       <template v-slot:totalCount="scope">
         <el-input
+          :disabled="title == '详情'"
           v-model="scope.row.confirmCount"
           @input="totalCountChange(scope.row, scope.$index)"
           type="number"
@@ -123,13 +158,27 @@
         ></el-input>
       </template>
       <template v-slot:remark="scope">
-        <el-input v-model="scope.row.remark" placeholder="请输入"></el-input>
+        <el-input
+          :disabled="title == '详情'"
+          v-model="scope.row.remark"
+          placeholder="请输入"
+        ></el-input>
       </template>
     </ele-pro-table>
 
     <div slot="footer" class="footer">
-      <el-button type="primary" @click="save" v-click-once>保存</el-button>
-      <el-button type="primary" @click="save('sub')" v-click-once
+      <el-button
+        type="primary"
+        @click="save"
+        v-click-once
+        v-if="title != '详情'"
+        >保存</el-button
+      >
+      <el-button
+        type="primary"
+        @click="save('sub')"
+        v-click-once
+        v-if="title != '详情'"
         >提交</el-button
       >
 
@@ -147,6 +196,10 @@
       ref="sendListDialogRef"
       @changeParent="getSaleOrderDetail"
     ></sendListDialog>
+    <bpmDetail
+      v-if="activeComp === 'bpm' && form.processInstanceId"
+      :id="form.processInstanceId"
+    ></bpmDetail>
   </ele-modal>
 </template>
 
@@ -163,6 +216,7 @@
     UpdateReceiveConfirmInformation
   } from '@/api/purchasingManage/invoiceConfirm';
   import { copyObj } from '@/utils/util';
+  import bpmDetail from '@/views/bpm/processInstance/detail.vue';
 
   let formDef = {
     receiveCode: '',
@@ -180,11 +234,19 @@
     mixins: [dictMixins, tabMixins],
     components: {
       processSubmitDialog,
-      sendListDialog
+      sendListDialog,
+      bpmDetail
     },
 
     data() {
       return {
+        activeComp: 'main',
+        billDetailDialogFlag: false,
+        fullscreen: false,
+        tabOptions: [
+          { key: 'main', name: '确认单详情' },
+          { key: 'bpm', name: '流程详情' }
+        ],
         cacheKeyUrl: 'eos-purchasingManage-invoiceConfirm-inventoryTable',
         visible: false,
         processSubmitDialogFlag: false,
@@ -543,6 +605,7 @@
 
       //打开新增编辑弹框
       async open(type, row, invoiceData) {
+        this.activeComp = 'main';
         this.title =
           type === 'add' ? '新增收货确认单' : type === 'view' ? '详情' : '修改';
         this.visible = true;
@@ -630,12 +693,12 @@
         this.$nextTick(() => {
           let params = {
             businessId: this.businessId || res,
-            businessKey: 'sales_sendconfirm_approve',
+            businessKey: 'purchase_receive_confirm_approve',
             formCreateUserId: data.createUserId,
             variables: {
-              businessCode: data.docNo,
-              businessName: data.contactName,
-              businessType: '发货确认单'
+              businessCode: data.receiveConfirmNo,
+              businessName: data.supplierName,
+              businessType: '收货确认单'
             }
           };
 

src/views/purchasingManage/purchaseOrder/invoiceConfirm/index.vue

@@ -38,7 +38,7 @@
             <el-link
               type="primary"
               :underline="false"
-              @click="receiveConfirmNo(row, 'receiveConfirmNo')"
+              @click="openorderDetail(row, 'receiveConfirmNo')"
             >
               {{ row.receiveConfirmNo }}
             </el-link>
@@ -324,11 +324,11 @@
         this.$nextTick(() => {
           let params = {
             businessId: res.id,
-            businessKey: 'sales_sendconfirm_approve',
+            businessKey: 'purchase_receive_confirm_approve',
             formCreateUserId: res.createUserId,
             variables: {
               businessCode: res.receiveConfirmNo,
-              businessName: res.contactName,
+              businessName: res.supplierName,
               businessType: '收货确认单'
             }
           };
@@ -338,6 +338,9 @@
       },
       //查看详情
       openorderDetail(row, type) {
+        if (type === 'receiveConfirmNo') {
+          this.$refs.invoiceDialogRef.open('view',row);
+        }
         if (type === 'receiveCode') {
           this.$refs.invoiceDetailDialogRef.open({id:row.receiveId});
         }

src/views/purchasingManage/purchaseOrder/returnGoods/components/detailDialog.vue

@@ -213,7 +213,7 @@
         row: {},
         activeName: 'base',
         form: {
-          orderFiles: [{ name: '222' }]
+          orderFiles: []
         },
         rules: {},
         detailData: {},