证照审核 生产编号

src/BIZComponents/inventoryTable.vue

@@ -918,7 +918,7 @@
           {
             minWidth: 160,
             prop: 'productionCodes',
-            label: '生产编码',
+            label: '生产编号',
             align: 'center'
           },
 

src/BIZComponents/inventoryTableDetails.vue

@@ -212,7 +212,7 @@
           {
             minWidth: 160,
             prop: 'productionCodes',
-            label: '生产编码',
+            label: '生产编号',
             align: 'center'
           },
           {

src/views/saleManage/businessOpportunity/index.vue

@@ -26,7 +26,6 @@
               icon="el-icon-plus"
               class="ele-btn-icon"
               @click="openEdit('add', {})"
-              v-if="contactStatus==1"
             >
               新建
             </el-button>

src/views/saleManage/contact/components/certificateManagement/components/detail-dialog.vue

@@ -1,9 +1,26 @@
 <template>
-  <el-dialog title="证照详情" :visible.sync="dialogVisible" width="60%"
-  append-to-body
-  
+  <ele-modal
+    title="证照详情"
+    :visible.sync="dialogVisible"
+    width="60%"
+    append-to-body
+    :maxable="true"
   >
-    <el-descriptions title="" :column="3" size="medium" border>
+    <div class="switch">
+      <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-descriptions title="" :column="3" size="medium" border   v-if="activeComp == 'main'">
       <el-descriptions-item>
         <template slot="label"> 证照编号 </template>
         {{ form.code }}
@@ -49,25 +66,36 @@
         {{ form.remark }}
       </el-descriptions-item>
     </el-descriptions>
+    <bpmDetail
+      v-if="activeComp == 'bpm' && form.processInstanceId"
+      :id="form.processInstanceId"
+    ></bpmDetail>
     <div slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
     </div>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>
   import { getPhotoInfo } from '@/api/saleManage/contact';
   import dictMixins from '@/mixins/dictMixins';
   import fileMain from '@/components/addDoc/index.vue';
+  import bpmDetail from '@/views/bpm/processInstance/detail.vue';
+
 
   export default {
     mixins: [dictMixins],
-    components: {fileMain},
+    components: { fileMain,bpmDetail },
     //注册组件
     data() {
       return {
         dialogVisible: false,
-        form: {}
+        form: {},
+        activeComp: 'main',
+        tabOptions: [
+          { key: 'main', name: '详情' },
+          { key: 'bpm', name: '审批流程' }
+        ],
       };
     },
     computed: {},
@@ -77,6 +105,8 @@
     },
     methods: {
       open(row) {
+        this.activeComp='main'
+
         this.dialogVisible = true;
         this.getInfo(row.id);
       },

src/views/saleManage/contact/components/certificateManagement/index.vue

@@ -1,85 +1,109 @@
 <template>
-
   <ele-pro-table
-      ref="table"
-      :columns="columns"
-      :datasource="tableList"
-      class="dict-table"
-      tool-class="ele-toolbar-form"
-      :need-page="false"
-    >
-      
+    ref="table"
+    :columns="columns"
+    :datasource="tableList"
+    class="dict-table"
+    tool-class="ele-toolbar-form"
+    :need-page="false"
+  >
     <addDialog ref="addDialogRef" @success="reload" />
     <detailDialog ref="detailDialogRef" />
-      <!-- 工具栏 -->
-      <template v-slot:toolbar>
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleUpload('add')"
-          v-if="holderData.holderId"
-          >添加</el-button
-        >
-        <!-- <el-button type="primary" @click="handleUpload">导入</el-button> -->
-      </template>
-      <template v-slot:code="{ row }">
-        <el-link type="primary" :underline="false" @click="openDetail(row)">{{
-          row.code
-        }}</el-link>
+    <!-- 工具栏 -->
+    <template v-slot:toolbar>
+      <el-button
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleUpload('add')"
+        v-if="holderData.holderId"
+        >添加</el-button
+      >
+      <!-- <el-button type="primary" @click="handleUpload">导入</el-button> -->
+    </template>
+    <template v-slot:code="{ row }">
+      <el-link type="primary" :underline="false" @click="openDetail(row)">{{
+        row.code
+      }}</el-link>
+
+      <p class="ele-text-info">
+        {{ getDictValue('客户/供应商资质类型', row.type) }}
+      </p>
+    </template>
+    <template v-slot:time="{ row }">
+      <p>起：{{ row.validityStartTime }}</p>
+      <p class="ele-text-info">止：{{ row.validityEndTime }}</p>
+    </template>
+    <template v-slot:createUser="{ row }">
+      <p>{{ row.createUserName }}</p>
+      <p>{{ row.createUserDeptName }}</p>
+      <p class="ele-text-info">{{ row.createTime }}</p>
+    </template>
+    <template v-slot:picture="{ row }">
+      <fileMain v-model="row.fileObj" type="view"></fileMain>
+    </template>
+    <template v-slot:action="{ row }">
+      <el-link
+        type="primary"
+        :underline="false"
+        icon="el-icon-edit"
+        @click="handleUpload(row)"
+        v-if="[0, 3].includes(row.approvalStatus)"
+      >
+        修改
+      </el-link>
+      <el-link
+        type="primary"
+        :underline="false"
+        icon="el-icon-edit"
+        @click="submit(row)"
+        v-if="[0, 3].includes(row.approvalStatus)"
+      >
+        提交
+      </el-link>
+      <el-popconfirm
+        class="ele-action"
+        title="确定要删除此信息吗？"
+        @confirm="remove([row.id])"
+        v-if="[0, 3].includes(row.approvalStatus)"
+      >
+        <template v-slot:reference>
+          <el-link type="danger" :underline="false" icon="el-icon-delete">
+            删除
+          </el-link>
+        </template>
+      </el-popconfirm>
+    </template>
+    <process-submit-dialog
+      api-fun-name="purchaseinquiryStatusAPI"
+      :processSubmitDialogFlag.sync="processSubmitDialogFlag"
+      v-if="processSubmitDialogFlag"
+      ref="processSubmitDialogRef"
+      @reload="reload"
 
-        <p class="ele-text-info">
-          {{ getDictValue('客户/供应商资质类型', row.type) }}
-        </p>
-      </template>
-      <template v-slot:time="{ row }">
-        <p>起：{{ row.validityStartTime }}</p>
-        <p class="ele-text-info">止：{{ row.validityEndTime }}</p>
-      </template>
-      <template v-slot:createUser="{ row }">
-        <p>{{ row.createUserName }}</p>
-        <p>{{ row.createUserDeptName }}</p>
-        <p class="ele-text-info">{{ row.createTime }}</p>
-      </template>
-      <template v-slot:picture="{ row }">
-        <fileMain v-model="row.fileObj" type="view"></fileMain>
-      </template>
-      <template v-slot:action="{ row }">
-        <el-link
-          type="primary"
-          :underline="false"
-          icon="el-icon-edit"
-          @click="handleUpload('edit', row)"
-        >
-          修改
-        </el-link>
-        <el-popconfirm
-          class="ele-action"
-          title="确定要删除此信息吗？"
-          @confirm="remove([row.id])"
-        >
-          <template v-slot:reference>
-            <el-link type="danger" :underline="false" icon="el-icon-delete">
-              删除
-            </el-link>
-          </template>
-        </el-popconfirm>
-      </template>
-    </ele-pro-table>
+    ></process-submit-dialog>
+  </ele-pro-table>
 </template>
 
 <script>
   import addDialog from './components/add-dialog.vue';
   import detailDialog from './components/detail-dialog.vue';
-  import { identityphotoList,deleteIdentityphoto } from '@/api/saleManage/contact';
+  import {
+    identityphotoList,
+    deleteIdentityphoto
+  } from '@/api/saleManage/contact';
   import dictMixins from '@/mixins/dictMixins';
   import { holderTypeOptions } from '@/enum/dict.js';
   import fileMain from '@/components/addDoc/index.vue';
+  import { reviewStatus } from '@/enum/dict';
+  import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
 
   export default {
     mixins: [dictMixins],
-    components: { addDialog, detailDialog, fileMain },
+    components: { addDialog, detailDialog, fileMain,processSubmitDialog },
     data() {
       return {
+        processSubmitDialogFlag:false,
+
         tableList: [],
         columns: [
           {
@@ -148,6 +172,15 @@
             minWidth: '100',
             showOverflowTooltip: true
           },
+          {
+            label: '审核状态',
+            prop: 'approvalStatus',
+            align: 'center',
+            width: 120,
+            formatter: (_row, _column, cellValue) => {
+              return reviewStatus[_row.approvalStatus];
+            }
+          },
           {
             columnKey: 'action',
             label: '操作',
@@ -174,6 +207,31 @@
         this.holderData = { holderId, holder, holderType };
         this.getTable();
       },
+      async submit(row) {
+        this.processSubmitDialogFlag = true;
+
+        this.$nextTick(() => {
+          let params = {
+            businessId: row.id,
+            businessKey:
+              row.holderType == 1
+                ? 'profession_person_approve'
+                : row.holderType == 4
+                ? 'contact_qc_approve'
+                : 'supplier_qc_approve',
+            formCreateUserId: row.createUserId,
+            variables: {
+              businessCode: row.code,
+              businessName: row.holder,
+              businessType:
+                row.holderType == 1
+                  ? this.getDictValue('证件类型', row.type)
+                  : this.getDictValue('客户/供应商资质类型', row.type)
+            }
+          };
+          this.$refs.processSubmitDialogRef.init(params);
+        });
+      },
       getTable() {
         identityphotoList({
           holderType: this.holderData.holderType,
@@ -183,9 +241,9 @@
         });
       },
       reload(data) {
-        if(data){
-          this.tableList.push(data)
-        }else{
+        if (data) {
+          this.tableList.push(data);
+        } else {
           this.getTable();
         }
       },

src/views/saleManage/quotation/index.vue

@@ -25,7 +25,6 @@
               icon="el-icon-plus"
               class="ele-btn-icon"
               @click="openEdit('add', {})"
-              v-if="contactData?.contactStatus==1"
             >
               新建
             </el-button>

src/views/saleManage/saleOrder/components/searchTable.vue

@@ -44,7 +44,20 @@ export default {
           type: 'input',
           placeholder: ''
         },
-
+        {
+          label: '编号',
+          value: 'productCodes',
+          width: 380,
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '生产编号',
+          value: 'productionCodes',
+          width: 380,
+          type: 'input',
+          placeholder: ''
+        },
         {
           label: '项目名称：',
           value: 'productCode',

src/views/saleManage/saleOrder/index.vue

@@ -481,6 +481,12 @@
             showOverflowTooltip: true,
             minWidth: 140
           },
+          {
+            minWidth: 160,
+            prop: 'productionCodes',
+            label: '生产编号',
+            align: 'center'
+          },
           {
             prop: 'batchNos',
             label: '批次号',

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -136,7 +136,7 @@
           <el-input v-model="scope.row.batchNo" v-no-chinese></el-input>
         </el-form-item>
       </template>
-      <!-- 生产编码 可编辑 -->
+      <!-- 生产编号 可编辑 -->
       <template v-slot:productionCodes="{ row }">
         <el-form-item>
           <el-input v-model="row.productionCodes" v-no-chinese></el-input>
@@ -546,7 +546,7 @@
           {
             minWidth: 160,
             prop: 'productionCodes',
-            label: '生产编码',
+            label: '生产编号',
             align: 'center',
             slot: 'productionCodes'
           },

src/views/saleManage/saleOrder/invoice/components/inventoryTableDetails.vue

@@ -125,7 +125,7 @@
           {
             minWidth: 160,
             prop: 'productionCodes',
-            label: '生产编码',
+            label: '生产编号',
             align: 'center'
           },
           {

src/views/saleManage/saleOrder/invoice/components/searchTable.vue

@@ -44,6 +44,13 @@ export default {
           type: 'input',
           placeholder: '请输入'
         },
+        {
+          label: '生产编号',
+          value: 'productionCodes',
+          width: 380,
+          type: 'input',
+          placeholder: ''
+        },
         {
           label: '批次号',
           value: 'batchNo',

src/views/saleManage/saleOrder/invoice/index.vue

@@ -327,6 +327,12 @@
             showOverflowTooltip: true,
             minWidth: 160
           },
+          {
+            minWidth: 160,
+            prop: 'productionCodes',
+            label: '生产编号',
+            align: 'center'
+          },
           {
             prop: 'batchNos',
             label: '批次号',

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐1
         // target: 'http://192.168.1.134:18086', //徐2
-        target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.103:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.105:18086',