Z 1 anno fa
parent
commit
1cfae2b4a4
53 ha cambiato i file con 706 aggiunte e 468 eliminazioni
  1. 3 0
      qiankun_config/store.js
  2. 13 0
      src/api/main/index.js
  3. 2 0
      src/main.js
  4. 29 0
      src/mixins/paramsDataMixins.js
  5. 1 0
      src/store/getters.js
  6. 8 10
      src/store/index.js
  7. 36 0
      src/store/modules/paramsSetData.js
  8. 17 15
      src/store/modules/user.js
  9. 1 1
      src/views/contractManage/contractBook/components/addDialog.vue
  10. 3 3
      src/views/contractManage/contractBook/index.vue
  11. 1 1
      src/views/financialManage/feeManage/feeApplication/addOrEditDialog.vue
  12. 3 3
      src/views/financialManage/feeManage/feeApplication/page.vue
  13. 1 1
      src/views/financialManage/invoiceManage/components/addOrEditDialog.vue
  14. 3 3
      src/views/financialManage/invoiceManage/index.vue
  15. 1 0
      src/views/login/index.vue
  16. 1 1
      src/views/purchasingManage/inquiryManage/components/addDialog.vue
  17. 3 3
      src/views/purchasingManage/inquiryManage/index.vue
  18. 3 3
      src/views/purchasingManage/producerManage/components/addContactDialog.vue
  19. 3 3
      src/views/purchasingManage/purchaseNeedManage/index.vue
  20. 3 3
      src/views/purchasingManage/purchaseOrder/accountstatement/index.vue
  21. 3 3
      src/views/purchasingManage/purchaseOrder/index.vue
  22. 1 1
      src/views/purchasingManage/purchaseOrder/invoice/components/addInvoiceDialog.vue
  23. 3 3
      src/views/purchasingManage/purchaseOrder/invoice/index.vue
  24. 3 3
      src/views/purchasingManage/purchaseOrder/outSourceSend/index.vue
  25. 3 3
      src/views/purchasingManage/purchaseOrder/returnGoods/index.vue
  26. 3 3
      src/views/purchasingManage/purchasePlanManage/index.vue
  27. 1 1
      src/views/purchasingManage/supplierManage/components/addContactDialog.vue
  28. 1 1
      src/views/purchasingManage/supplierManage/components/certificateQualificationsDialog.vue
  29. 1 1
      src/views/saleManage/businessOpportunity/components/addOpportunityDialog.vue
  30. 5 5
      src/views/saleManage/businessOpportunity/index.vue
  31. 39 7
      src/views/saleManage/contact/components/addContactDialog.vue
  32. 17 9
      src/views/saleManage/contact/components/contactDetailDialog.vue
  33. 3 3
      src/views/saleManage/contact/components/darwerComponents/certificateTable.vue
  34. 11 2
      src/views/saleManage/contact/components/drawer.vue
  35. 375 320
      src/views/saleManage/contact/contactList.vue
  36. 68 15
      src/views/saleManage/contact/contactListAdmin.vue
  37. 2 2
      src/views/saleManage/contact/index.vue
  38. 1 1
      src/views/saleManage/quotation/components/addDialog.vue
  39. 3 3
      src/views/saleManage/quotation/index.vue
  40. 3 3
      src/views/saleManage/saleOrder/accountstatement/index.vue
  41. 1 1
      src/views/saleManage/saleOrder/components/addDialog.vue
  42. 1 1
      src/views/saleManage/saleOrder/customerReturnOrder/add-sale-order-dialog.vue
  43. 1 1
      src/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue
  44. 2 2
      src/views/saleManage/saleOrder/customerReturnOrder/index.vue
  45. 1 1
      src/views/saleManage/saleOrder/entrustedReceive/components/addOrEditDialog.vue
  46. 3 3
      src/views/saleManage/saleOrder/entrustedReceive/index.vue
  47. 3 3
      src/views/saleManage/saleOrder/index.vue
  48. 1 1
      src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue
  49. 3 3
      src/views/saleManage/saleOrder/invoice/index.vue
  50. 1 1
      src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue
  51. 1 1
      src/views/saleManage/saleOrder/returnGoods/components/customerReturnOrderDialog.vue
  52. 4 8
      src/views/saleManage/saleOrder/returnGoods/index.vue
  53. 3 3
      src/views/transportManager/shipManage/dispatchManage/page.vue

+ 3 - 0
qiankun_config/store.js

@@ -26,6 +26,9 @@ export default function (state) {
   if (state.user?.authorityDept) {
     store.dispatch('user/getCurrentUserAuthorityDept');
   }
+  if (state.paramsSetData) {
+    store.dispatch('paramsSetData/setParamsDataInfo');
+  }
 }
 
 export const createMutationObserve = ({ modules = [] }) => {

+ 13 - 0
src/api/main/index.js

@@ -33,3 +33,16 @@ export async function getFactoryarea (params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+/**
+ * 参数设置
+ * @param params 查询条件
+ */
+export async function parameterPageList(params) {
+  const res = await request.get('/sys/parameter/page', {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 2 - 0
src/main.js

@@ -37,6 +37,8 @@ let instance = null;
 // bpmnProcessDesigner 需要引入
 import MyPD from '@/components/bpmnProcessDesigner/package/index.js';
 Vue.use(MyPD);
+import paramsDataMixins from './mixins/paramsDataMixins';
+Vue.mixin(paramsDataMixins);
 import '@/components/bpmnProcessDesigner/package/theme/index.scss';
 import 'bpmn-js/dist/assets/diagram-js.css';
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css';

+ 29 - 0
src/mixins/paramsDataMixins.js

@@ -0,0 +1,29 @@
+import { mapGetters, mapActions } from 'vuex';
+export default {
+  data() {
+    return {};
+  },
+  computed: {
+    ...mapGetters(['paramsSetData']),
+    //流程是否需要审核
+    isNeed_process_is_close() {
+      let index = this.paramsSetData.paramsData.findIndex(
+        (item) => item.code == 'process_is_close'
+      );
+      if (index > -1) {
+        const param = this.paramsSetData.paramsData[index];
+        if (param.enable) {
+          return true;
+        } else return param.value == 0;
+      }
+      return true;
+    },
+    //客户基本信息是否需要审批
+    isNeed_contact_is_approval() {
+      console.log(this.paramsSetData.paramsData, '====');
+    }
+  },
+  methods: {
+    ...mapActions('dict', ['requestDict'])
+  }
+};

+ 1 - 0
src/store/getters.js

@@ -4,6 +4,7 @@
 import dictEnum from '@/enum/dict';
 export default {
   user: (state) => state.user,
+  paramsSetData: (state) => state.paramsSetData,
   theme: (state) => state.theme,
   dict: (state) => state.dict,
   // 根据字典enumName  和 dictCode 获取字典项

+ 8 - 10
src/store/index.js

@@ -6,11 +6,12 @@ import Vuex from 'vuex';
 import getters from './getters';
 import dict from './modules/dict';
 import user from './modules/user';
-import concact from './modules/concact'
-import order from './modules/order'
-import returnGoods from './modules/returnGoods'
+import concact from './modules/concact';
+import order from './modules/order';
+import returnGoods from './modules/returnGoods';
 import selectCache from './modules/selectCache';
 import theme from './modules/theme';
+import paramsSetData from '@/store/modules/paramsSetData';
 import createPersistedState from 'vuex-persistedstate';
 
 import { SYSTEM_NAME } from '@/config/setting';
@@ -18,12 +19,8 @@ import { SYSTEM_NAME } from '@/config/setting';
 Vue.use(Vuex);
 
 export default new Vuex.Store({
-  state: {
-    
-  },
-  mutations: {
-   
-  },
+  state: {},
+  mutations: {},
   actions: {},
   modules: {
     dict,
@@ -32,6 +29,7 @@ export default new Vuex.Store({
     returnGoods,
     order,
     selectCache,
+    paramsSetData,
     theme
   },
   getters,
@@ -42,7 +40,7 @@ export default new Vuex.Store({
         ? `vuex-${SYSTEM_NAME}`
         : `private-vuex-${SYSTEM_NAME}`,
       storage: window.sessionStorage,
-      paths: ['user']
+      paths: ['user', 'paramsSetData']
     })
   ]
 });

+ 36 - 0
src/store/modules/paramsSetData.js

@@ -0,0 +1,36 @@
+// 数据缓存
+import Vue from 'vue';
+import { parameterPageList } from '@/api/main';
+const state = {
+  paramsData: []
+};
+
+const mutations = {
+  // 获取当前登录参数配置数据
+  setParamsData(state, info) {
+    state.paramsData = info;
+  }
+};
+
+const actions = {
+  setParamsDataInfo({ commit }) {
+    parameterPageList({
+      pageNum: 1,
+      size: 999
+    })
+      .then((res) => {
+        console.log(res.list);
+        commit('setParamsData', res.list);
+      })
+      .catch((e) => {
+        commit('setParamsData', []);
+      });
+  }
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+};

+ 17 - 15
src/store/modules/user.js

@@ -6,7 +6,7 @@ import { USER_MENUS } from '@/config/setting';
 import { getResourcesTree } from '@/api/layout';
 import { SYSTEM_NAME } from '@/config/setting';
 import Vue from 'vue';
-import { getCurrentUserAuthorityDeptAPI } from '@/api/system/organization';
+import { parameterPageList } from '@/api/main';
 
 const formatRouter = (list) => {
   let menuList = []; // menuType
@@ -57,7 +57,6 @@ export default {
   mutations: {
     // 设置登录用户的信息
     setUserInfo(state, info) {
-    
       state.info = info;
     },
     // 设置登录用户的菜单
@@ -79,7 +78,7 @@ export default {
     // 当前登录用户的数据权限部门数据
     setAuthorityDept(state, info) {
       state.authorityDept = info;
-    }
+    },
   },
   actions: {
     async getCurrentUserAuthorityDept({ commit }) {
@@ -120,8 +119,11 @@ export default {
     // },
     //动态路由
     async fetchUserInfo({ commit, state }) {
-      let currentUser = JSON.parse(sessionStorage['currentUser'])
-      const result = await getResourcesTree({ groupId: currentUser.currentGroupId, roleId: currentUser.currentRoleId }).catch(() => { });
+      let currentUser = JSON.parse(sessionStorage['currentUser']);
+      const result = await getResourcesTree({
+        groupId: currentUser.currentGroupId,
+        roleId: currentUser.currentRoleId
+      }).catch(() => {});
       const list = result.filter((i) => i.path === `/page-${SYSTEM_NAME}`);
       if (!list?.length) {
         return {};
@@ -142,20 +144,20 @@ export default {
       // 用户菜单, 过滤掉按钮类型并转为 children 形式
       const { menus, homePath } = formatMenus(
         USER_MENUS ??
-        toTreeData({
-          data: menuList,
-          idField: 'id',
-          parentIdField: 'parentId'
-        })
+          toTreeData({
+            data: menuList,
+            idField: 'id',
+            parentIdField: 'parentId'
+          })
       );
       // 用户路由按钮
       const { menus: authoritiesRouter } = formatMenus(
         USER_MENUS ??
-        toTreeData({
-          data: authorities.filter((i) => i.path),
-          idField: 'id',
-          parentIdField: 'parentId'
-        })
+          toTreeData({
+            data: authorities.filter((i) => i.path),
+            idField: 'id',
+            parentIdField: 'parentId'
+          })
       );
       commit('setMenus', menus);
       commit('setAuthoritiesRouter', authoritiesRouter);

+ 1 - 1
src/views/contractManage/contractBook/components/addDialog.vue

@@ -465,7 +465,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
 

+ 3 - 3
src/views/contractManage/contractBook/index.vue

@@ -83,7 +83,7 @@
               <template v-slot:action="{ row }">
                 <el-link
                   type="primary"
-                  v-if="[0, 3].includes(row.status)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.status))||!isNeed_process_is_close"
                   :underline="false"
                   icon="el-icon-edit"
                   @click="openEdit('edit', row)"
@@ -92,7 +92,7 @@
                 </el-link>
                 <el-link
                   type="primary"
-                  v-if="[0, 3].includes(row.status)"
+                  v-if="isNeed_process_is_close&&[0, 3].includes(row.status)"
                   :underline="false"
                   icon="el-icon-plus"
                   @click="contractBookSubmit(row)"
@@ -109,7 +109,7 @@
                   生成订单
                 </el-link>
                 <el-popconfirm
-                  v-if="[0, 3].includes(row.status)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.status))||!isNeed_process_is_close"
                   class="ele-action"
                   title="确定要删除此信息吗?"
                   @confirm="remove([row.id])"

+ 1 - 1
src/views/financialManage/feeManage/feeApplication/addOrEditDialog.vue

@@ -164,7 +164,7 @@
                             @setTotalPrice="setTotalPrice"></fee-related-info-table>
     <div slot="footer">
       <el-button type="primary" @click="handleSave(0)">保存</el-button>
-      <el-button type="primary" @click="handleSave(1)">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="handleSave(1)">提交</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
     <!--选择客户/供应商-->

+ 3 - 3
src/views/financialManage/feeManage/feeApplication/page.vue

@@ -38,7 +38,7 @@
       <template v-slot:action="{row}">
         <el-link
           type="primary"
-          v-if="[0, 3].includes(row.approvalStatus)"
+          v-if="isNeed_process_is_close&&[0, 3].includes(row.approvalStatus)"
           :underline="false"
           icon="el-icon-plus"
           @click="sub(row)"
@@ -47,7 +47,7 @@
         </el-link>
         <el-link
           type="primary"
-          v-if="[0, 3].includes(row.approvalStatus)"
+          v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
           :underline="false"
           icon="el-icon-edit"
           @click="handleAddOrEdit(row,'update')"
@@ -57,7 +57,7 @@
 
 
         <el-popconfirm
-          v-if="[0, 3].includes(row.approvalStatus)"
+          v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))&&!isNeed_process_is_close"
           class="ele-action"
           title="确定要删除此信息吗?"
           @confirm="remove([row.id])"

+ 1 - 1
src/views/financialManage/invoiceManage/components/addOrEditDialog.vue

@@ -193,7 +193,7 @@
     ></table-info>
     <div slot="footer">
       <el-button type="primary" @click="handleSave(0)">保存</el-button>
-      <el-button type="primary" @click="handleSave(1)">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="handleSave(1)">提交</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
     <process-submit-dialog :processSubmitDialogFlag.sync="processSubmitDialogFlag" v-if="processSubmitDialogFlag" ref="processSubmitDialogRef" @reload="reload"></process-submit-dialog>

+ 3 - 3
src/views/financialManage/invoiceManage/index.vue

@@ -41,7 +41,7 @@
             type="primary"
             :underline="false"
             icon="el-icon-edit"
-            v-if="[0, 3].includes(row.approvalStatus)"
+            v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
             @click="handleAddOrEdit(row,'update')">
             修改
           </el-link>
@@ -50,7 +50,7 @@
             :underline="false"
             icon="el-icon-plus"
             @click="sub(row)"
-            v-if="[0, 3].includes(row.approvalStatus)">
+            v-if="isNeed_process_is_close&&[0, 3].includes(row.approvalStatus)">
             提交
           </el-link>
           <el-popconfirm
@@ -63,7 +63,7 @@
                 type="danger"
                 :underline="false"
                 icon="el-icon-delete"
-                v-if="[0, 3].includes(row.approvalStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
               >
                 删除
               </el-link>

+ 1 - 0
src/views/login/index.vue

@@ -189,6 +189,7 @@ export default {
             this.$message.success(res.message);
 
             this.$store.dispatch('user/getCurrentUserAuthorityDept');
+            this.$store.dispatch('paramsSetData/setParamsDataInfo');
             this.goHome();
           })
           .catch((e) => {

+ 1 - 1
src/views/purchasingManage/inquiryManage/components/addDialog.vue

@@ -7,7 +7,7 @@
             <div style="padding-bottom: 10px">
               <el-button @click="cancel">返回</el-button>
               <el-button type="primary" @click="save">保存</el-button>
-              <el-button type="primary" @click="save('sub')">提交</el-button>
+              <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
             </div>
           </template>
         </headerTitle>

+ 3 - 3
src/views/purchasingManage/inquiryManage/index.vue

@@ -75,7 +75,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.status)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.status))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -84,7 +84,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="sub(row)"
-              v-if="[0, 3].includes(row.status)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.status)"
             >
               提交
             </el-link>
@@ -102,7 +102,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.status)"
+              v-if="([0, 3].includes(row.status)&&isNeed_process_is_close)||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 3 - 3
src/views/purchasingManage/producerManage/components/addContactDialog.vue

@@ -579,7 +579,7 @@
               详情
             </el-link>
             <el-link
-              v-if="[0, 3].includes(scope.row.processStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus))||!isNeed_process_is_close"
               type="primary"
               :underline="false"
               icon="el-icon-edit"
@@ -589,7 +589,7 @@
             </el-link>
 
             <el-link
-              v-if="[0, 3].includes(scope.row.processStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus))||!isNeed_process_is_close"
               type="primary"
               :underline="false"
               icon="el-icon-plus"
@@ -605,7 +605,7 @@
             >
               <template v-slot:reference>
                 <el-link
-                  v-if="[0, 3].includes(scope.row.processStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus))||!isNeed_process_is_close"
                   type="danger"
                   :underline="false"
                   icon="el-icon-delete"

+ 3 - 3
src/views/purchasingManage/purchaseNeedManage/index.vue

@@ -63,7 +63,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.status)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.status))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -72,7 +72,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="sub(row)"
-              v-if="[0, 3].includes(row.status)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.status)"
             >
               提交
             </el-link>
@@ -80,7 +80,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.status)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.status))||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 3 - 3
src/views/purchasingManage/purchaseOrder/accountstatement/index.vue

@@ -61,7 +61,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="handleAddOrEditAccount('edit',row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -70,7 +70,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="accountstatementSubmit(row)"
-              v-if="[0, 3].includes(row.reviewStatus)">
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)">
               提交
             </el-link>
             <el-popconfirm
@@ -82,7 +82,7 @@
                   type="danger"
                   :underline="false"
                   icon="el-icon-delete"
-                  v-if="[0, 3].includes(row.reviewStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
                 >
                   删除
                 </el-link>

+ 3 - 3
src/views/purchasingManage/purchaseOrder/index.vue

@@ -83,7 +83,7 @@
                   type="primary"
                   :underline="false"
                   icon="el-icon-edit"
-                  v-if="[0, 3].includes(row.orderStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.orderStatus))||!isNeed_process_is_close"
                   @click="openEdit('edit', row)"
                 >
                   修改
@@ -93,14 +93,14 @@
                   :underline="false"
                   icon="el-icon-plus"
                   @click="saleOrderSubmit(row)"
-                  v-if="[0, 3].includes(row.orderStatus)"
+                  v-if="isNeed_process_is_close&&[0, 3].includes(row.orderStatus)"
                 >
                   提交
                 </el-link>
                 <el-popconfirm
                   class="ele-action"
                   title="确定要删除此信息吗?"
-                  v-if="[0, 3].includes(row.orderStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.orderStatus))||!isNeed_process_is_close"
                   @confirm="remove([row.id])"
                 >
                   <template v-slot:reference>

+ 1 - 1
src/views/purchasingManage/purchaseOrder/invoice/components/addInvoiceDialog.vue

@@ -167,7 +167,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
     <!-- 采购订单   -->

+ 3 - 3
src/views/purchasingManage/purchaseOrder/invoice/index.vue

@@ -69,7 +69,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -78,7 +78,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="sub(row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
             >
               提交
             </el-link>
@@ -86,7 +86,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 3 - 3
src/views/purchasingManage/purchaseOrder/outSourceSend/index.vue

@@ -69,7 +69,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -79,7 +79,7 @@
               icon="el-icon-plus"
 
               @click="sendSubmit(row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
             >
               提交
             </el-link>
@@ -88,7 +88,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 3 - 3
src/views/purchasingManage/purchaseOrder/returnGoods/index.vue

@@ -72,7 +72,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -81,7 +81,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="sub(row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
             >
               提交
             </el-link>
@@ -89,7 +89,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 3 - 3
src/views/purchasingManage/purchasePlanManage/index.vue

@@ -184,7 +184,7 @@
                 type="primary"
                 :underline="false"
                 icon="el-icon-edit"
-                v-if="[0, 3].includes(row.status) && !row.isCut"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.status) && !row.isCut)||(!isNeed_process_is_close&&!row.isCut)"
                 @click="openEdit('edit', row)"
               >
                 修改
@@ -193,7 +193,7 @@
                 type="primary"
                 :underline="false"
                 icon="el-icon-edit"
-                v-if="[0, 3].includes(row.status)"
+                v-if="isNeed_process_is_close&&[0, 3].includes(row.status)"
                 @click="submitPlan(row)"
               >
                 提交
@@ -226,7 +226,7 @@
               <el-popconfirm
                 class="ele-action"
                 title="确定要删除此信息吗?"
-                v-if="[0, 3].includes(row.status) && !row.isCut"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.status) && !row.isCut)||(!isNeed_process_is_close&&!row.isCut)"
                 @confirm="remove([row.id])"
               >
                 <template v-slot:reference>

+ 1 - 1
src/views/purchasingManage/supplierManage/components/addContactDialog.vue

@@ -365,7 +365,7 @@
             </el-link>
 
             <el-link
-              v-if="[0,3].includes(scope.row.processStatus)"
+              v-if="isNeed_process_is_close&&[0,3].includes(scope.row.processStatus)"
               type="primary"
               :underline="false"
               icon="el-icon-plus"

+ 1 - 1
src/views/purchasingManage/supplierManage/components/certificateQualificationsDialog.vue

@@ -245,7 +245,7 @@
     </el-tabs>
     <div slot="footer" v-if="activeName=='QC'">
       <el-button v-if="type!=='view'" type="primary" @click="handleSave(false)">保存</el-button>
-      <el-button v-if="type!=='view'" type="primary" plan @click="handleSave(true)">提交</el-button>
+      <el-button v-if="isNeed_process_is_close&&type!=='view'" type="primary" plan @click="handleSave(true)">提交</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
     <staffSelection

+ 1 - 1
src/views/saleManage/businessOpportunity/components/addOpportunityDialog.vue

@@ -163,7 +163,7 @@
     ></personnelAddTable>
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
 
       <el-button @click="cancel">返回</el-button>
     </div>

+ 5 - 5
src/views/saleManage/businessOpportunity/index.vue

@@ -51,7 +51,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="handleFollow(row)"
-              v-if="[0, 3].includes(row.approvalStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
             >
               跟进
             </el-link>
@@ -68,7 +68,7 @@
               type="primary"
               :underline="false"
               icon="el-icon-edit"
-              v-if="[0, 3].includes(row.approvalStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
               @click="openEdit('edit', row)"
             >
               修改
@@ -78,7 +78,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="sub(row)"
-              v-if="[0, 3].includes(row.approvalStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.approvalStatus)"
             >
               提交
             </el-link>
@@ -111,7 +111,7 @@
                   type="danger"
                   :underline="false"
                   icon="el-icon-delete"
-                  v-if="[0, 3].includes(row.approvalStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
                 >
                   删除
                 </el-link>
@@ -275,7 +275,7 @@
           //   align: 'center',
           //   showOverflowTooltip: true,
           //   minWidth: 140,
-           
+
           // },
           {
             prop: 'remark',

+ 39 - 7
src/views/saleManage/contact/components/addContactDialog.vue

@@ -597,7 +597,7 @@
               详情
             </el-link>
             <el-link
-              v-if="[0, 3].includes(scope.row.processStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus))||isNeed_process_is_close"
               type="primary"
               :underline="false"
               icon="el-icon-edit"
@@ -607,7 +607,7 @@
             </el-link>
 
             <el-link
-              v-if="[0, 3].includes(scope.row.processStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus)"
               type="primary"
               :underline="false"
               icon="el-icon-plus"
@@ -623,7 +623,7 @@
             >
               <template v-slot:reference>
                 <el-link
-                  v-if="[0, 3].includes(scope.row.processStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus))||!isNeed_process_is_close"
                   type="danger"
                   :underline="false"
                   icon="el-icon-delete"
@@ -650,9 +650,8 @@
         :disabled="activeName == 5"
         >下一步</el-button
       >
-      <el-button type="primary" v-if="activeName == 5||title!='新建客户'" @click="save"
-        >保存</el-button
-      >
+      <el-button type="primary" v-if="activeName == 5||title!='新建客户'" @click="save">保存</el-button>
+      <el-button type="primary" v-if="(activeName == 5||title!='新建客户')&&isNeed_process_is_close" @click="save('sub')">提交</el-button>
 
       <el-button @click="cancel">返回</el-button>
     </div>
@@ -1092,6 +1091,31 @@ export default {
       };
       this.$refs.certificateTable.reload({ ...where });
     },
+    //开启客户提交流程
+    async contactSubmit(row) {
+      const data = await contactDetail(this.form.id||row);
+      this.processSubmitDialogFlag = true
+      this.$nextTick(()=>{
+        let params = {
+          businessId: data.id,
+          businessKey : 'contact_approve',
+          formCreateUserId: data.createUserId,
+          variables:{
+            certificationType: 1
+          },
+          // callBackMethodType : '1',
+          // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
+          // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
+          // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
+          // miniHandle : '',
+          // miniView : '',
+        }
+        this.$refs.processSubmitDialogRef.init(params)
+      })
+      // await contactQcSubmit({ businessId: row.id, certificationType: 1 });
+
+      // this.reload();
+    },
     //开启资质提交流程
     async submit(row) {
       this.processSubmitDialogFlag = true
@@ -1233,7 +1257,7 @@ export default {
         this.activeName += 1;
       }
     },
-    async save() {
+    async save(type='') {
       try {
         await this.getValidate();
         // 表单验证通过,执行保存操作
@@ -1316,6 +1340,10 @@ export default {
             .then((res) => {
               this.loading = false;
               this.$message.success('修改成功');
+              if(type=='sub'){
+                this.contactSubmit(res)
+                return
+              }
               this.cancel();
               this.$emit('done');
             })
@@ -1327,6 +1355,10 @@ export default {
             .then((id) => {
               this.loading = false;
               this.$message.success('新增成功');
+              if(type=='sub'){
+                this.contactSubmit(id)
+                return
+              }
               this.cancel();
               this._getById(id);
               this.title = '编辑客户';

+ 17 - 9
src/views/saleManage/contact/components/contactDetailDialog.vue

@@ -427,7 +427,7 @@
                 :underline="false"
                 icon="el-icon-edit"
                 @click="openEdit('edit', row)"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||isNeed_process_is_close"
               >
                 修改
               </el-link>
@@ -437,7 +437,7 @@
                 icon="el-icon-plus"
 
                 @click="sendSubmit(row)"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
               >
                 提交
               </el-link>
@@ -446,7 +446,7 @@
                 class="ele-action"
                 title="确定要删除此信息吗?"
                 @confirm="remove([row.id])"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
               >
                 <template v-slot:reference>
                   <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -534,7 +534,7 @@
                 :underline="false"
                 icon="el-icon-edit"
                 @click="openEdit('edit', row)"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
               >
                 修改
               </el-link>
@@ -543,7 +543,7 @@
                 :underline="false"
                 icon="el-icon-plus"
                 @click="returnSubmit(row)"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))"
               >
                 提交
               </el-link>
@@ -551,7 +551,7 @@
               <el-popconfirm
                 class="ele-action"
                 title="确定要删除此信息吗?"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
                 @confirm="remove([row.id])"
               >
                 <template v-slot:reference>
@@ -607,7 +607,7 @@
                 :underline="false"
                 icon="el-icon-edit"
                 @click="handleAddOrEditAccount('update',row)"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
               >
                 修改
               </el-link>
@@ -616,7 +616,7 @@
                 :underline="false"
                 icon="el-icon-plus"
                 @click="accountstatementSubmit(row)"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
               >
                 提交
               </el-link>
@@ -625,7 +625,7 @@
                 class="ele-action"
                 title="确定要删除此信息吗?"
                 @confirm="remove([row.id])"
-                v-if="[0, 3].includes(row.reviewStatus)"
+                v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
               >
                 <template v-slot:reference>
                   <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -691,6 +691,12 @@
           </ele-pro-table>
         </el-card>
       </el-tab-pane>
+      <el-tab-pane label="审批流程" name="bpm">
+        <bpmDetail
+          v-if="activeName === 'bpm' && form.processInstanceId"
+          :id="form.processInstanceId"
+        ></bpmDetail>
+      </el-tab-pane>
     </el-tabs>
 
     <div slot="footer" class="footer">
@@ -726,6 +732,7 @@ import {getSendTableList} from "@/api/saleManage/saleordersendrecord";
 import {getReturnTableList} from "@/api/saleManage/returnGoods";
 import {getAccountstatementList} from "@/api/saleManage/accountstatement";
 import {finPayablePageListAPI} from "@/api/financialManage/payableManage";
+import bpmDetail from "@/views/bpm/processInstance/detail.vue";
 
 
 export default {
@@ -734,6 +741,7 @@ export default {
   },
   mixins: [dictMixins],
   components: {
+    bpmDetail,
     searchTable,
     certificateQualificationsDialog,
     fileUpload,

+ 3 - 3
src/views/saleManage/contact/components/darwerComponents/certificateTable.vue

@@ -27,7 +27,7 @@
         详情
       </el-link>
       <el-link
-        v-if="[0, 3].includes(scope.row.processStatus)"
+        v-if="(isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus))||!isNeed_process_is_close"
         type="primary"
         :underline="false"
         icon="el-icon-edit"
@@ -37,7 +37,7 @@
       </el-link>
 
       <el-link
-        v-if="[0, 3].includes(scope.row.processStatus)"
+        v-if="isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus)"
         type="primary"
         :underline="false"
         icon="el-icon-plus"
@@ -53,7 +53,7 @@
       >
         <template v-slot:reference>
           <el-link
-            v-if="[0, 3].includes(scope.row.processStatus)"
+            v-if="(isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus))||!isNeed_process_is_close"
             type="danger"
             :underline="false"
             icon="el-icon-delete"

+ 11 - 2
src/views/saleManage/contact/components/drawer.vue

@@ -28,7 +28,7 @@
         </div>
         <el-tabs
           v-model="activeName"
-        
+
           style="height: calc(100% - 124px)"
         >
           <el-tab-pane label="详细信息" name="详细信息">
@@ -101,6 +101,13 @@
           <el-tab-pane label="其他信息" name="其他信息">
             <otherForm ref="otherFormRef"></otherForm>
           </el-tab-pane>
+          <el-tab-pane label="审批流程" name="审批流程">
+            <bpmDetail
+              v-if="activeName === '审批流程' && row.base.processInstanceId"
+              :id="row.base.processInstanceId"
+            ></bpmDetail>
+          </el-tab-pane>
+
         </el-tabs>
       </div>
 
@@ -187,11 +194,13 @@ import receivableManage from '@/views/financialManage/receivableManage/index.vue
 import followList from './darwerComponents/followList.vue';
 import TinymceEditor from '@/components/TinymceEditor/index.vue';
 import { mapGetters } from 'vuex';
+import bpmDetail from "@/views/bpm/processInstance/detail.vue";
 
 export default {
   mixins: [dictMixins],
 
   components: {
+    bpmDetail,
     contactInfo,
     bankInfo,
     linkInfo,
@@ -310,4 +319,4 @@ export default {
   overflow: auto;
   height: calc(100% - 51px);
 }
-</style>
+</style>

+ 375 - 320
src/views/saleManage/contact/contactList.vue

@@ -11,7 +11,7 @@
         <AssetTree
           @handleNodeClick="handleNodeClick"
           :defaultExpandedKeys="defaultExpandedKeys"
-          :defaultExpandAll = false
+          :defaultExpandAll=false
           id="17"
           :isFirstRefreshTable="false"
           ref="treeList"
@@ -21,7 +21,7 @@
 
     <template v-slot:content>
       <div class="ele-border-lighter form-content" v-loading="loading" style="margin-right: 10px">
-        <contact-search @search="reload"> </contact-search>
+        <contact-search @search="reload"></contact-search>
 
         <!-- 数据表格 -->
         <ele-pro-table
@@ -63,55 +63,67 @@
 
           <template v-slot:name="{ row }">
             <el-link type="primary" :underline="false" @click="openDetail(row)">
-              {{ row.name }}</el-link
+              {{ row.name }}
+            </el-link
             >
           </template>
 
           <!-- 操作列 -->
-          <!-- <template v-slot:action="{ row }">
-                <el-link
-                  type="primary"
-                  :underline="false"
-                  icon="el-icon-edit"
-                  @click="openEdit('编辑客户',row)"
-                >
-                  修改
-                </el-link>
-                <el-link
-                  v-if="row.status===2"
-                  type="primary"
-                  :underline="false"
-                  icon="el-icon-check"
-                  @click="enableOption(row)"
-                >
-                  启用
-                </el-link>
+          <template v-slot:action="{ row }">
+            <el-link
+              type="primary"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
+              :underline="false"
+              icon="el-icon-edit"
+              @click="openEdit('编辑客户',row)"
+            >
+              修改
+            </el-link>
+            <el-link
+              type="primary"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.approvalStatus)"
+              :underline="false"
+              icon="el-icon-plus"
+              @click="sub(row)"
+            >
+              提交
+            </el-link>
+            <!--                <el-link-->
+            <!--                  v-if="row.status===2"-->
+            <!--                  type="primary"-->
+            <!--                  :underline="false"-->
+            <!--                  icon="el-icon-check"-->
+            <!--                  @click="enableOption(row)"-->
+            <!--                >-->
+            <!--                  启用-->
+            <!--                </el-link>-->
+            <!--                <el-link-->
+            <!--                  v-if="row.status===1"-->
+            <!--                  type="primary"-->
+            <!--                  :underline="false"-->
+            <!--                  icon="el-icon-close"-->
+            <!--                  @click="disableOption(row)"-->
+            <!--                >-->
+            <!--                  禁用-->
+            <!--                </el-link>-->
+
+            <el-popconfirm
+              class="ele-action"
+              title="确定要删除此客户信息吗?"
+              @confirm="remove(row)"
+            >
+              <template v-slot:reference>
                 <el-link
-                  v-if="row.status===1"
-                  type="primary"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
+                  type="danger"
                   :underline="false"
-                  icon="el-icon-close"
-                  @click="disableOption(row)"
+                  icon="el-icon-delete"
                 >
-                  禁用
+                  删除
                 </el-link>
-
-                <el-popconfirm
-                  class="ele-action"
-                  title="确定要删除此客户信息吗?"
-                  @confirm="remove(row)"
-                >
-                  <template v-slot:reference>
-                    <el-link
-                      type="danger"
-                      :underline="false"
-                      icon="el-icon-delete"
-                    >
-                      删除
-                    </el-link>
-                  </template>
-                </el-popconfirm>
-              </template> -->
+              </template>
+            </el-popconfirm>
+          </template>
         </ele-pro-table>
       </div>
     </template>
@@ -122,6 +134,7 @@
     ></AddContactDialog>
     <ContactDetailDialog ref="contactDetailDialogRef"></ContactDetailDialog>
     <drawer ref="drawerRef"></drawer>
+    <process-submit-dialog :processSubmitDialogFlag.sync="processSubmitDialogFlag" v-if="processSubmitDialogFlag" ref="processSubmitDialogRef" @reload="reload"></process-submit-dialog>
 
   </ele-split-layout>
   <!-- </el-card> -->
@@ -132,306 +145,348 @@
 </template>
 
 <script>
-  import ContactSearch from './components/contactSearch.vue';
-  import AddContactDialog from './components/addContactDialog.vue';
-  import ContactDetailDialog from './components/contactDetailDialog.vue';
-  // import popModal from '@/components/pop-modal';
-  import AssetTree from '@/components/AssetTree';
-  import {
-    contactDelete,
-    contactPage,
-    contactTypeTree,
-    updateStatus,
-    apply
-  } from '@/api/saleManage/contact';
-  import dictMixins from '@/mixins/dictMixins';
-  import drawer from './components/drawer.vue';
+import ContactSearch from './components/contactSearch.vue';
+import AddContactDialog from './components/addContactDialog.vue';
+import ContactDetailDialog from './components/contactDetailDialog.vue';
+// import popModal from '@/components/pop-modal';
+import AssetTree from '@/components/AssetTree';
+import {apply, contactDelete, contactPage, contactTypeTree, updateStatus} from '@/api/saleManage/contact';
+import dictMixins from '@/mixins/dictMixins';
+import drawer from './components/drawer.vue';
+import {reviewStatus} from "@/enum/dict";
+import processSubmitDialog from "@/BIZComponents/processSubmitDialog/processSubmitDialog.vue";
+import {mapGetters} from "vuex";
 
-  export default {
-    mixins: [dictMixins],
-    components: {
-      AssetTree,
-      ContactSearch,
-      // popModal,
-      AddContactDialog,
-      ContactDetailDialog,drawer
-    },
-    data() {
-      return {
-        selection: [],
-        defaultExpandedKeys:[],
-        delVisible: false,
-        // 加载状态
-        loading: false,
-        columns: [
-          {
-            width: 45,
-            type: 'selection',
-            columnKey: 'selection',
-            align: 'center'
-          },
-          {
-            columnKey: 'index',
-            label: '序号',
-            type: 'index',
-            width: 55,
-            align: 'center',
-            showOverflowTooltip: true,
-            fixed: 'left'
-          },
-          {
-            prop: 'code',
-            label: '客户编码',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 140
-          },
-          {
-            prop: 'name',
-            label: '客户名称',
-            align: 'center',
-            slot: 'name',
-            showOverflowTooltip: true,
-            minWidth: 200
-          },
-          {
-            prop: 'serialNo',
-            label: '客户代号',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 140
-          },
-          {
-            prop: 'phone',
-            label: '客户电话',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 120
-          },
-          {
-            prop: 'addressName',
-            label: '单位地址',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 120,
-            formatter: (_row, _column, cellValue) => {
-              let addr =
-                '' + _row.addressName
-                  ? _row.addressName.replaceAll(',', '')
-                  : '';
-              addr += _row.address ? _row.address : '';
-              return addr;
-            }
-          },
-          {
-            prop: 'linkName',
-            label: '联系人',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 120
-          },
-          {
-            prop: 'linkPhone',
-            label: '联系人电话',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 120
-          },
+export default {
+  mixins: [dictMixins],
+  components: {
+    processSubmitDialog,
+    AssetTree,
+    ContactSearch,
+    // popModal,
+    AddContactDialog,
+    ContactDetailDialog, drawer
+  },
+  data() {
+    return {
+      selection: [],
+      defaultExpandedKeys: [],
+      delVisible: false,
+      // 加载状态
+      loading: false,
+      processSubmitDialogFlag: false,
+      columns: [
+        {
+          width: 45,
+          type: 'selection',
+          columnKey: 'selection',
+          align: 'center'
+        },
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
+        {
+          prop: 'code',
+          label: '客户编码',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 140
+        },
+        {
+          prop: 'name',
+          label: '客户名称',
+          align: 'center',
+          slot: 'name',
+          showOverflowTooltip: true,
+          minWidth: 200
+        },
+        {
+          prop: 'serialNo',
+          label: '客户代号',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 140
+        },
+        {
+          prop: 'phone',
+          label: '客户电话',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120
+        },
+        {
+          prop: 'addressName',
+          label: '单位地址',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120,
+          formatter: (_row, _column, cellValue) => {
+            let addr =
+              '' + _row.addressName
+                ? _row.addressName.replaceAll(',', '')
+                : '';
+            addr += _row.address ? _row.address : '';
+            return addr;
+          }
+        },
+        {
+          prop: 'linkName',
+          label: '联系人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120
+        },
+        {
+          prop: 'linkPhone',
+          label: '联系人电话',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120
+        },
 
-          {
-            prop: 'parentName',
-            label: '上级单位',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 120
-          },
-          {
+        {
+          prop: 'parentName',
+          label: '上级单位',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120
+        },
+        {
           prop: 'salesmanName',
           label: '销售员',
           align: 'center',
           showOverflowTooltip: true,
           minWidth: 120
         },
-          {
-            prop: 'status',
-            label: '状态',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 100,
-            formatter: (_row, _column, cellValue) => {
-              return _row.status === 1 ? '启用' : '禁用';
-            }
-          },
-          {
-            prop: 'createUsername',
-            label: '创建人',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 100
-          },
-          {
-            prop: 'createTime',
-            label: '创建时间',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 160,
-            formatter: (_row, _column, cellValue) => {
-              return this.$util.toDateString(cellValue);
-            }
+        {
+          prop: 'status',
+          label: '状态',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100,
+          formatter: (_row, _column, cellValue) => {
+            return _row.status === 1 ? '启用' : '禁用';
           }
-          // {
-          //   columnKey: 'action',
-          //   label: '操作',
-          //   width: 200,
-          //   align: 'center',
-          //   resizable: false,
-          //   slot: 'action',
-          //   showOverflowTooltip: true,
-          //   fixed: 'right',
-          // }
-        ],
-        current: {},
-        curNodeData: {},
-        treeList: [],
-        treeLoading: false,
-        formData: {},
-        rootTreeId: null,
-        defaultProps: {
-          children: 'children',
-          label: 'name'
         },
-        showEdit: true
-      };
-    },
-    computed: {},
-    created() {
-      this.requestDict('客户状态');
-      this.getTreeData();
-    },
-    methods: {
-      /* 表格数据源 */
-      datasource({ page, limit, where, order }) {
-        return contactPage({
-          pageNum: page,
-          size: limit,
-          assignStatus: 0,
-          type: 1,
-          ...where
-        });
-      },
-      async getTreeData() {
-        try {
-          this.treeLoading = true;
-          const res = await contactTypeTree({ type: 17 });
-          this.treeLoading = false;
-          if (res?.code === '0') {
-            this.treeList = res.data;
-            this.$nextTick(() => {
-              this.defaultExpandedKeys = this.treeList?.map(item=>item.id) ||[17]
-              // 默认高亮第一级树节点
-              // if (this.treeList[0]) {
-              //   this.rootTreeId = this.treeList[0].id;
-              //   this.getDetail(this.treeList[0].id);
-              // }
-            });
-            return this.treeList;
+        {
+          prop: 'approvalStatus',
+          label: '审批状态',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100,
+          formatter: (_row, _column, cellValue) => {
+            return reviewStatus[_row.approvalStatus];
           }
-        } catch (error) {}
-        this.treeLoading = false;
-      },
-      handleNodeClick(data, node) {
-        this.curNodeData = data;
-        this.reload({ categoryId: data.id });
-      },
-      /* 刷新表格 */
-      reload(where) {
-        this.$refs.table.reload({ page: 1, where });
-      },
-      openEdit(row, type) {
-        this.current = row;
-        this.showEdit = true;
-        this.$refs.addContactDialogRef.open(row, type, this.curNodeData.id);
-        this.$refs.addContactDialogRef.$refs.form &&
-          this.$refs.addContactDialogRef.$refs.form.clearValidate();
-      },
-      //批量删除
-      allDelBtn() {
-        if (this.selection.length === 0) return;
-        this.delVisible = true;
+        },
+        {
+          prop: 'createUsername',
+          label: '创建人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 160,
+          formatter: (_row, _column, cellValue) => {
+            return this.$util.toDateString(cellValue);
+          }
+        },
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 200,
+          align: 'center',
+          resizable: false,
+          slot: 'action',
+          showOverflowTooltip: true,
+          fixed: 'right',
+        }
+      ],
+      current: {},
+      curNodeData: {},
+      treeList: [],
+      treeLoading: false,
+      formData: {},
+      rootTreeId: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
       },
-      commitBtn() {
-        console.log(this.selection);
-        const dataId = this.selection.map((v) => v.id);
-        contactDelete(dataId).then((res) => {
-          this.$message.success('删除成功!');
+      showEdit: true
+    };
+  },
+  computed: {
+
+  },
+  created() {
+    this.requestDict('客户状态');
+    this.getTreeData();
+  },
+  methods: {
+    /* 表格数据源 */
+    datasource({page, limit, where, order}) {
+      return contactPage({
+        pageNum: page,
+        size: limit,
+        assignStatus: 0,
+        type: 1,
+        ...where
+      });
+    },
+    async getTreeData() {
+      try {
+        this.treeLoading = true;
+        const res = await contactTypeTree({type: 17});
+        this.treeLoading = false;
+        if (res?.code === '0') {
+          this.treeList = res.data;
+          this.$nextTick(() => {
+            this.defaultExpandedKeys = this.treeList?.map(item => item.id) || [17]
+            // 默认高亮第一级树节点
+            // if (this.treeList[0]) {
+            //   this.rootTreeId = this.treeList[0].id;
+            //   this.getDetail(this.treeList[0].id);
+            // }
+          });
+          return this.treeList;
+        }
+      } catch (error) {
+      }
+      this.treeLoading = false;
+    },
+    handleNodeClick(data, node) {
+      this.curNodeData = data;
+      this.reload({categoryId: data.id});
+    },
+    /* 刷新表格 */
+    reload(where) {
+      this.$refs.table.reload({page: 1, where});
+    },
+    sub(res) {
+      this.processSubmitDialogFlag = true
+      this.$nextTick(()=>{
+        let params = {
+          businessId:res.id,
+          businessKey : 'contact_approve',
+          formCreateUserId: res.createUserId,
+          variables:{
+            certificationType: 1
+          },
+          // callBackMethodType : '1',
+          // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
+          // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
+          // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
+          // miniHandle : '',
+          // miniView : '',
+        }
+
+
+        this.$refs.processSubmitDialogRef.init(params)
+      })
+      // submit({
+      //   businessId: res.id
+      // }).then((res) => {
+      //   this.$message.success('提交成功!');
+      //   this.reload();
+      // });
+    },
+    openEdit(row, type) {
+      this.current = row;
+      this.showEdit = true;
+      this.$refs.addContactDialogRef.open(row, type, this.curNodeData.id);
+      this.$refs.addContactDialogRef.$refs.form &&
+      this.$refs.addContactDialogRef.$refs.form.clearValidate();
+    },
+    //批量删除
+    allDelBtn() {
+      if (this.selection.length === 0) return;
+      this.delVisible = true;
+    },
+    commitBtn() {
+      console.log(this.selection);
+      const dataId = this.selection.map((v) => v.id);
+      contactDelete(dataId).then((res) => {
+        this.$message.success('删除成功!');
+        this.reload();
+      });
+    },
+    remove(row) {
+      contactDelete([row.id]).then((res) => {
+        this.$message.success('删除成功!');
+        this.reload();
+      });
+    },
+    /** 启用客户 */
+    enableOption(row) {
+      updateStatus(row.id, 1)
+        .then((msg) => {
+          this.$message.success('客户启用成功');
           this.reload();
+        })
+        .catch((e) => {
+          this.$message.error(e.message);
         });
-      },
-      remove(row) {
-        contactDelete([row.id]).then((res) => {
-          this.$message.success('删除成功!');
+    },
+    /** 禁用客户 */
+    disableOption(row) {
+      updateStatus(row.id, 2)
+        .then((msg) => {
+          this.$message.success('客户禁用成功');
           this.reload();
+        })
+        .catch((e) => {
+          this.$message.error(e.message);
         });
-      },
-      /** 启用客户 */
-      enableOption(row) {
-        updateStatus(row.id, 1)
-          .then((msg) => {
-            this.$message.success('客户启用成功');
-            this.reload();
-          })
-          .catch((e) => {
-            this.$message.error(e.message);
-          });
-      },
-      /** 禁用客户 */
-      disableOption(row) {
-        updateStatus(row.id, 2)
-          .then((msg) => {
-            this.$message.success('客户禁用成功');
-            this.reload();
-          })
-          .catch((e) => {
-            this.$message.error(e.message);
-          });
-      },
+    },
 
-      //申请
-      addApply(type, row) {
-        let contactIds = [];
-        let contactNames = [];
-        contactIds = this.selection.map((item) => item.id).toString();
-        contactNames = this.selection.map((item) => item.name).toString();
-        apply({ contactIds, contactNames }).then((res) => {
-          this.$message.success('申请成功');
-          this.reload();
-        });
-      },
-      openDetail(row) {
-        // this.$refs.contactDetailDialogRef.open(row);
+    //申请
+    addApply(type, row) {
+      let contactIds = [];
+      let contactNames = [];
+      contactIds = this.selection.map((item) => item.id).toString();
+      contactNames = this.selection.map((item) => item.name).toString();
+      apply({contactIds, contactNames}).then((res) => {
+        this.$message.success('申请成功');
+        this.reload();
+      });
+    },
+    openDetail(row) {
+      // this.$refs.contactDetailDialogRef.open(row);
       this.$refs.drawerRef.open(row);
 
-      }
     }
-  };
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-  :deep(.el-link--inner) {
-    margin-left: 0px !important;
-  }
+:deep(.el-link--inner) {
+  margin-left: 0px !important;
+}
 
-  .sys-organization-list {
-    height: calc(100vh - 264px);
-    box-sizing: border-box;
-    border-width: 1px;
-    border-style: solid;
-    overflow: auto;
-  }
-  .sys-organization-list :deep(.el-tree-node__content) {
-    height: 40px;
-    & > .el-tree-node__expand-icon {
-      margin-left: 10px;
-    }
+.sys-organization-list {
+  height: calc(100vh - 264px);
+  box-sizing: border-box;
+  border-width: 1px;
+  border-style: solid;
+  overflow: auto;
+}
+
+.sys-organization-list :deep(.el-tree-node__content) {
+  height: 40px;
+
+  & > .el-tree-node__expand-icon {
+    margin-left: 10px;
   }
+}
 </style>

+ 68 - 15
src/views/saleManage/contact/contactListAdmin.vue

@@ -54,17 +54,17 @@
             >
               新建
             </el-button>
-            <el-button
-              size="small"
-              type="danger"
-              el-icon-delete
-              class="ele-btn-icon"
-              v-if="$hasPermission('eom:contact:delete')"
-              @click="allDelBtn"
-              :disabled="selection?.length === 0"
-            >
-              批量删除
-            </el-button>
+<!--            <el-button-->
+<!--              size="small"-->
+<!--              type="danger"-->
+<!--              el-icon-delete-->
+<!--              class="ele-btn-icon"-->
+<!--              v-if="$hasPermission('eom:contact:delete')"-->
+<!--              @click="allDelBtn"-->
+<!--              :disabled="selection?.length === 0"-->
+<!--            >-->
+<!--              批量删除-->
+<!--            </el-button>-->
             <el-button
               size="small"
               type="primary"
@@ -100,15 +100,24 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('编辑客户', row)"
-              v-if="row.assignStatus !== 1&& $hasPermission('eom:contact:update')"
+              v-if="row.assignStatus !== 1&& $hasPermission('eom:contact:update')&&[0, 3].includes(row.approvalStatus)"
             >
               修改
             </el-link>
+            <el-link
+              type="primary"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.approvalStatus)"
+              :underline="false"
+              icon="el-icon-plus"
+              @click="sub(row)"
+            >
+              提交
+            </el-link>
             <el-link
               type="primary"
               v-if="
-                row.assignStatus === 0 && $hasPermission('eom:contact:assign')
-              "
+                row.assignStatus === 0 && $hasPermission('eom:contact:assign')&&[2].includes(row.approvalStatus)
+            "
               :underline="false"
               @click="assign('', row)"
             >
@@ -144,7 +153,7 @@
             <el-popconfirm
               class="ele-action"
               title="确定要删除此客户信息吗?"
-              v-if="row.assignStatus !== 1&& $hasPermission('eom:contact:delete')"
+              v-if="(row.assignStatus !== 1&& $hasPermission('eom:contact:delete')&&[0, 3].includes(row.approvalStatus)&&isNeed_process_is_close)||(row.assignStatus !== 1&& $hasPermission('eom:contact:delete')&&!isNeed_process_is_close)"
               @confirm="remove(row)"
             >
               <template v-slot:reference>
@@ -172,6 +181,8 @@
       @done="commitBtn"
     />
     <drawer ref="drawerRef"></drawer>
+    <process-submit-dialog :processSubmitDialogFlag.sync="processSubmitDialogFlag" v-if="processSubmitDialogFlag" ref="processSubmitDialogRef" @reload="reload"></process-submit-dialog>
+
   </ele-split-layout>
   <!-- </el-card> -->
 
@@ -195,10 +206,13 @@ import {
 import dictMixins from '@/mixins/dictMixins';
 import drawer from './components/drawer.vue';
 import { mapGetters } from 'vuex';
+import {reviewStatus} from "@/enum/dict";
+import processSubmitDialog from "@/BIZComponents/processSubmitDialog/processSubmitDialog.vue";
 
 export default {
   mixins: [dictMixins],
   components: {
+    processSubmitDialog,
     AssetTree,
     ContactSearch,
     popModal,
@@ -212,6 +226,7 @@ export default {
       selection: [],
       defaultExpandedKeys: [],
       delVisible: false,
+      processSubmitDialogFlag: false,
       // 加载状态
       loading: false,
       columns: [
@@ -322,6 +337,16 @@ export default {
             return _row.status === 1 ? '启用' : '禁用';
           }
         },
+        {
+          prop: 'approvalStatus',
+          label: '审批状态',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100,
+          formatter: (_row, _column, cellValue) => {
+            return reviewStatus[_row.approvalStatus];
+          }
+        },
         {
           prop: 'createUsername',
           label: '创建人',
@@ -420,6 +445,34 @@ export default {
       this.$refs.addContactDialogRef.$refs.form &&
         this.$refs.addContactDialogRef.$refs.form.clearValidate();
     },
+    sub(res) {
+      this.processSubmitDialogFlag = true
+      this.$nextTick(()=>{
+        let params = {
+          businessId:res.id,
+          businessKey : 'contact_approve',
+          formCreateUserId: res.createUserId,
+          variables:{
+            certificationType: 1
+          },
+          // callBackMethodType : '1',
+          // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
+          // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
+          // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
+          // miniHandle : '',
+          // miniView : '',
+        }
+
+
+        this.$refs.processSubmitDialogRef.init(params)
+      })
+      // submit({
+      //   businessId: res.id
+      // }).then((res) => {
+      //   this.$message.success('提交成功!');
+      //   this.reload();
+      // });
+    },
     //批量删除
     allDelBtn() {
       if (this.selection.length === 0) return;

+ 2 - 2
src/views/saleManage/contact/index.vue

@@ -148,8 +148,8 @@
           </div>
         </template>
       </ele-split-layout>
-           <contactList v-if="activeComp == 'contactList' && $hasPermission('eom:contact:staff') "></contactList>
-      <contactListAdmin v-if="activeComp == 'contactList'"></contactListAdmin>
+      <contactList v-if="activeComp == 'contactList' && $hasPermission('eom:contact:staff') "></contactList>
+      <contactListAdmin v-else-if="activeComp == 'contactList'"></contactListAdmin>
     </el-card>
 
     <AddContactDialog

+ 1 - 1
src/views/saleManage/quotation/components/addDialog.vue

@@ -253,7 +253,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" @click="isNeed_process_is_close&&save('sub')">提交</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
 

+ 3 - 3
src/views/saleManage/quotation/index.vue

@@ -52,7 +52,7 @@
               type="primary"
               :underline="false"
               icon="el-icon-edit"
-              v-if="[0, 3].includes(row.status)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.status))||!isNeed_process_is_close"
               @click="openEdit('edit', row)"
             >
               修改
@@ -61,7 +61,7 @@
               type="primary"
               :underline="false"
               icon="el-icon-plus"
-              v-if="[0, 3].includes(row.status)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.status)"
               @click="quotationSubmit(row)"
             >
               提交
@@ -93,7 +93,7 @@
                   type="danger"
                   :underline="false"
                   icon="el-icon-delete"
-                  v-if="[0, 3].includes(row.status)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.status))||!isNeed_process_is_close"
                 >
                   删除
                 </el-link>

+ 3 - 3
src/views/saleManage/saleOrder/accountstatement/index.vue

@@ -67,7 +67,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="handleAddOrEditAccount('update', row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -76,7 +76,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="accountstatementSubmit(row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
             >
               提交
             </el-link>
@@ -85,7 +85,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 1 - 1
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -344,7 +344,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
 
       <el-button @click="cancel">返回</el-button>
     </div>

+ 1 - 1
src/views/saleManage/saleOrder/customerReturnOrder/add-sale-order-dialog.vue

@@ -113,7 +113,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
 
       <el-button @click="cancel">返回</el-button>
     </div>

+ 1 - 1
src/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue

@@ -163,7 +163,7 @@
     </el-form>
     <div slot="footer" v-if="dialogType!=='view'">
       <el-button type="primary" @click="handleSubmit('save')">保存</el-button>
-      <el-button type="primary" @click="handleSubmit('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="handleSubmit('sub')">提交</el-button>
       <el-button type="info" @click="cancel">关闭</el-button>
     </div>
     <!--出库详情-->

+ 2 - 2
src/views/saleManage/saleOrder/customerReturnOrder/index.vue

@@ -87,7 +87,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="returnSubmit(row)"
-              v-if="[0, 3].includes(row.approvalStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.approvalStatus)"
             >
               提交
             </el-link>
@@ -103,7 +103,7 @@
             <el-popconfirm
               class="ele-action"
               title="确定要删除此信息吗?"
-              v-if="[0, 3].includes(row.approvalStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.approvalStatus))||!isNeed_process_is_close"
               @confirm="remove([row.id])"
             >
               <template v-slot:reference>

+ 1 - 1
src/views/saleManage/saleOrder/entrustedReceive/components/addOrEditDialog.vue

@@ -125,7 +125,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
 
       <el-button @click="cancel">返回</el-button>
     </div>

+ 3 - 3
src/views/saleManage/saleOrder/entrustedReceive/index.vue

@@ -69,7 +69,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -79,7 +79,7 @@
               icon="el-icon-plus"
 
               @click="sendSubmit(row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
             >
               提交
             </el-link>
@@ -88,7 +88,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 3 - 3
src/views/saleManage/saleOrder/index.vue

@@ -82,7 +82,7 @@
                   :underline="false"
                   icon="el-icon-edit"
                   @click="openEdit('edit', row)"
-                  v-if="[0, 3].includes(row.orderStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.orderStatus))||!isNeed_process_is_close"
                 >
                   修改
                 </el-link>
@@ -91,7 +91,7 @@
                   :underline="false"
                   icon="el-icon-plus"
                   @click="saleOrderSubmitOrGenerate(row)"
-                  v-if="[0, 3].includes(row.orderStatus)"
+                  v-if="isNeed_process_is_close&&[0, 3].includes(row.orderStatus)"
                 >
                   提交
                 </el-link>
@@ -113,7 +113,7 @@
                   class="ele-action"
                   title="确定要删除此信息吗?"
                   @confirm="remove([row.id])"
-                  v-if="[0, 3].includes(row.orderStatus)"
+                  v-if="(isNeed_process_is_close&&[0, 3].includes(row.orderStatus))||!isNeed_process_is_close"
                 >
                   <template v-slot:reference>
                     <el-link

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -147,7 +147,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
 
       <el-button @click="cancel">返回</el-button>
     </div>

+ 3 - 3
src/views/saleManage/saleOrder/invoice/index.vue

@@ -78,7 +78,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="([0, 3].includes(row.reviewStatus)&&isNeed_process_is_close)||!isNeed_process_is_close"
             >
               修改
             </el-link>
@@ -87,7 +87,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="sendSubmit(row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
             >
               提交
             </el-link>
@@ -96,7 +96,7 @@
               class="ele-action"
               title="确定要删除此信息吗?"
               @confirm="remove([row.id])"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
             >
               <template v-slot:reference>
                 <el-link type="danger" :underline="false" icon="el-icon-delete">

+ 1 - 1
src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue

@@ -206,7 +206,7 @@
 
     <div slot="footer" class="footer">
       <el-button type="primary" @click="save">保存</el-button>
-      <el-button type="primary" @click="save('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="save('sub')">提交</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
     <!--  销售发货单  -->

+ 1 - 1
src/views/saleManage/saleOrder/returnGoods/components/customerReturnOrderDialog.vue

@@ -161,7 +161,7 @@
     </el-card>
     <div slot="footer" v-if="activeComp == taskDefinitionKey&&dialogType!=='view'">
       <el-button type="primary" @click="handleSubmit('save')">保存</el-button>
-      <el-button type="primary" @click="handleSubmit('sub')">提交</el-button>
+      <el-button type="primary" v-if="isNeed_process_is_close" @click="handleSubmit('sub')">提交</el-button>
       <el-button type="info" @click="cancel">关闭</el-button>
     </div>
     <!--出库详情-->

+ 4 - 8
src/views/saleManage/saleOrder/returnGoods/index.vue

@@ -88,11 +88,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="handleCreateCROrder('update', row)"
-              v-if="
-                row.handleReceiptId &&
-                row.canCreateHandleReceipt == '0' &&
-                [0, 3].includes(row.handleReceiptApproveStatus)
-              "
+              v-if="  (row.handleReceiptId && row.canCreateHandleReceipt == '0' && [0, 3].includes(row.handleReceiptApproveStatus)&&isNeed_process_is_close)||(row.handleReceiptId && row.canCreateHandleReceipt == '0' &&!isNeed_process_is_close)"
             >
               退货处理
             </el-link>
@@ -101,7 +97,7 @@
               :underline="false"
               icon="el-icon-edit"
               @click="openEdit('edit', row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)||!isNeed_process_is_close)"
             >
               修改
             </el-link>
@@ -110,7 +106,7 @@
               :underline="false"
               icon="el-icon-plus"
               @click="returnSubmit(row)"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
             >
               提交
             </el-link>
@@ -118,7 +114,7 @@
             <el-popconfirm
               class="ele-action"
               title="确定要删除此信息吗?"
-              v-if="[0, 3].includes(row.reviewStatus)"
+              v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
               @confirm="remove([row.id])"
             >
               <template v-slot:reference>

+ 3 - 3
src/views/transportManager/shipManage/dispatchManage/page.vue

@@ -38,7 +38,7 @@
       <template v-slot:action="{row}">
         <el-link
           type="primary"
-          v-if="[0, 3].includes(row.processStatus)"
+          v-if="([0, 3].includes(row.processStatus)&&isNeed_process_is_close)||!isNeed_process_is_close"
           :underline="false"
           icon="el-icon-plus"
           @click="sub(row)"
@@ -47,7 +47,7 @@
         </el-link>
         <el-link
           type="primary"
-          v-if="[0, 3].includes(row.processStatus)"
+          v-if="(isNeed_process_is_close&&[0, 3].includes(row.processStatus))||!isNeed_process_is_close"
           :underline="false"
           icon="el-icon-edit"
           @click="handleAddOrEdit(row,'update')"
@@ -72,7 +72,7 @@
         </el-link>
 
         <el-popconfirm
-          v-if="[0, 3].includes(row.processStatus)"
+          v-if="(isNeed_process_is_close&&[0, 3].includes(row.processStatus))||isNeed_process_is_close"
           class="ele-action"
           title="确定要删除此信息吗?"
           @confirm="remove([row.id])"