修改退料

src/BIZComponents/inventoryTableDetails.vue

@@ -39,7 +39,7 @@
         </el-form-item>
       </template>
       <template v-slot:customerExpectDeliveryDeadline="scope">
-        <div v-if="scope.row.arrivalWay == 1">
+        <div v-if="scope.row.arrivalWay == 1 || !scope.row.arrivalWay">
           {{ scope.row.customerExpectDeliveryDeadline }}
         </div>
         <div v-if="scope.row.arrivalWay == 2">
@@ -135,6 +135,10 @@
         type: Boolean,
         default: false
       },
+      isArrivalWay: {
+        type: Boolean,
+        default: false
+      },
       countObj: {
         type: Object,
         default: () => {
@@ -459,21 +463,19 @@
             label: '图号/件号',
             showOverflowTooltip: true
           },
-            {
+          {
             minWidth: 120,
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             prop: 'provenance',

src/BIZComponents/processSubmitDialog/processSubmitDialog.vue

@@ -166,7 +166,11 @@
             >
               <template v-slot="scope">
                 <div
-                  v-if="scope.row.type !== 60 &&scope.row.type !== 70 && scope.row.options.length > 0"
+                  v-if="
+                    scope.row.type !== 60 &&
+                    scope.row.type !== 70 &&
+                    scope.row.options.length > 0
+                  "
                 >
                   <el-tag
                     size="medium"
@@ -177,7 +181,10 @@
                   </el-tag>
                 </div>
 
-                <el-tag size="medium" v-if="scope.row.type === 60||scope.row.type === 70">
+                <el-tag
+                  size="medium"
+                  v-if="scope.row.type === 60 || scope.row.type === 70|| scope.row.type === 80"
+                >
                   {{ getAssignRuleOptionName(scope.row) }}
                 </el-tag>
               </template>
@@ -286,7 +293,7 @@
   import { getToken } from '@/utils/token-util';
   import { mapGetters } from 'vuex';
   import staffSelection from '@/components/staffSelection/staffSelection.vue';
-  import { topLevel1, topLevel2 } from '@/enum/dict';
+  import { topLevel1, topLevel2, topLevel3 } from '@/enum/dict';
   import dayjs from 'dayjs';
   import { number } from 'echarts';
   import { del } from 'vue';
@@ -566,6 +573,9 @@ this.postOptions.push(...response.data);
           } else {
             return topLevel1.find((item) => item.value == data.topLevel)?.label;
           }
+        } else if (row.type === 80) {
+          let data = JSON.parse(row.variableName);
+          return topLevel3.find((item) => item.value == data.topLevel)?.label;
         }
         return '未知(' + option + ')';
       },

src/enum/dict.js

@@ -196,6 +196,46 @@ export const saleOrderProgressStatusEnum = [
   { value: 800, label: '全部发货' },
   { value: 1000, label: '完成' }
 ];
+
+export const topLevel3 = [
+  {
+    label: '上级部门负责人',
+    value: '1'
+  },
+  {
+    label: '上二级部门负责人',
+    value: '2'
+  },
+  {
+    label: '上三级部门负责人',
+    value: '3'
+  },
+  {
+    label: '上四级部门负责人',
+    value: '4'
+  },
+  {
+    label: '上五级部门负责人',
+    value: '5'
+  },
+  {
+    label: '上六级部门负责人',
+    value: '6'
+  },
+  {
+    label: '上七级部门负责人',
+    value: '7'
+  },
+  {
+    label: '上八级部门负责人',
+    value: '8'
+  },
+  {
+    label: '上九级部门负责人',
+    value: '9'
+  }
+];
+
 export const topLevel1 = [
   {
     label: '直接部门负责人',

src/views/bpm/done/detailDialog.vue

@@ -32,7 +32,7 @@
         :edit="false"
         ref="generateForm"
       >
-              <template v-slot:blank_adopzrdd="scope">
+        <template v-slot:blank_adopzrdd="scope">
           <div v-for="(item, index) in scope.model.blank_adopzrdd" :key="index">
             <div class="blank_adopzrdd">
               <span>{{ index + 1 }}报销事项：</span>
@@ -111,6 +111,7 @@
 
         this.activeComp = 'main';
         this.visible = true;
+        console.log('this.form.pcViewRouter', this.form.pcViewRouter);
         Vue.component('async-biz-form-component', (resolve) => {
           require([`@/views${this.form.pcViewRouter}`], resolve);
         });
@@ -142,7 +143,7 @@
       font-weight: bold;
     }
   }
-    .blank_adopzrdd {
+  .blank_adopzrdd {
     display: flex;
     align-items: center;
     > span {

src/views/bpm/handleTask/components/contractBook/detailDialog.vue

@@ -4,15 +4,14 @@
       <headerTitle title="合同信息"></headerTitle>
       <el-row>
         <el-col :span="12">
-          <el-form-item
-            label="合同类型："
-            prop="type"
-          >
+          <el-form-item label="合同类型：" prop="type">
             {{ form.typeName }} {{ form.categoryName }}
           </el-form-item>
           <el-form-item label="来源类型：">
-         {{ sourceTypeList.find(item=>item.code==form.sourceType)?.name }}
-            </el-form-item>
+            {{
+              sourceTypeList.find((item) => item.code == form.sourceType)?.name
+            }}
+          </el-form-item>
           <el-form-item
             label="核价单："
             prop="sourceName"
@@ -41,10 +40,7 @@
           >
             {{ form.sourceName }}
           </el-form-item>
-          <el-form-item
-            label="合同名称："
-            prop="contractName"
-          >
+          <el-form-item label="合同名称：" prop="contractName">
             {{ form.contractName }}
           </el-form-item>
           <el-form-item
@@ -62,37 +58,22 @@
             {{ form.requireDeptName }}
           </el-form-item>
 
-          <el-form-item
-            label="编码："
-            prop="contractNumber"
-          >
+          <el-form-item label="编码：" prop="contractNumber">
             {{ form.contractNo }}
           </el-form-item>
-          <el-form-item
-            label="合同编号："
-            prop="contractNumber"
-          >
+          <el-form-item label="合同编号：" prop="contractNumber">
             {{ form.contractNumber }}
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="签订日期："
-            prop="contractStartDate"
-          >
+          <el-form-item label="签订日期：" prop="contractStartDate">
             {{ form.contractStartDate }}
           </el-form-item>
-          <el-form-item
-            label="结束日期："
-            prop="contractEndDate"
-          >
+          <el-form-item label="结束日期：" prop="contractEndDate">
             {{ form.contractEndDate }}
           </el-form-item>
 
-          <el-form-item
-            label="结算方式："
-            prop="payWay"
-          >
+          <el-form-item label="结算方式：" prop="payWay">
             {{ form.settlementModeName }}
           </el-form-item>
           <el-form-item
@@ -110,10 +91,7 @@
       <headerTitle title="基本信息"></headerTitle>
       <el-row>
         <el-col :span="12">
-          <el-form-item
-            label="甲方名称："
-            prop="partaName"
-          >
+          <el-form-item label="甲方名称：" prop="partaName">
             {{ form.partaName }}
           </el-form-item>
           <el-form-item
@@ -123,44 +101,25 @@
           >
             {{ form.partaUnifiedSocialCreditCode }}
           </el-form-item>
-          <el-form-item
-            label="甲方联系人："
-            prop="partaLinkName"
-          >
+          <el-form-item label="甲方联系人：" prop="partaLinkName">
             {{ form.partaLinkName }}
           </el-form-item>
-          <el-form-item
-            label="甲方电话："
-            prop="partaTel"
-          >
+          <el-form-item label="甲方电话：" prop="partaTel">
             {{ form.partaTel }}
           </el-form-item>
-          <el-form-item
-            label="甲方传真："
-            prop="partaFax"
-          >
+          <el-form-item label="甲方传真：" prop="partaFax">
             {{ form.partaFax }}
           </el-form-item>
-          <el-form-item
-            label="	甲方Email："
-            prop="partaEmail"
-          >
+          <el-form-item label="	甲方Email：" prop="partaEmail">
             {{ form.partaEmail }}
           </el-form-item>
-          <el-form-item
-            label="甲方地址："
-            prop="partaAddress"
-          >
+          <el-form-item label="甲方地址：" prop="partaAddress">
             {{ form.partaAddress }}
           </el-form-item>
-         
         </el-col>
 
         <el-col :span="12">
-          <el-form-item
-            label="乙方名称："
-            prop="partbName"
-          >
+          <el-form-item label="乙方名称：" prop="partbName">
             {{ form.partbName }}
           </el-form-item>
           <el-form-item
@@ -170,10 +129,7 @@
           >
             {{ form.partbUnifiedSocialCreditCode }}
           </el-form-item>
-          <el-form-item
-            label="乙方联系人："
-            prop="partbLinkName"
-          >
+          <el-form-item label="乙方联系人：" prop="partbLinkName">
             {{ form.partbLinkName }}
           </el-form-item>
           <el-form-item prop="partbTel" label="乙方联系电话：">
@@ -183,20 +139,13 @@
             {{ form.partbFax }}
           </el-form-item>
 
-          <el-form-item
-            label="乙方Email："
-            prop="partbEmail"
-          >
+          <el-form-item label="乙方Email：" prop="partbEmail">
             {{ form.partbEmail }}
           </el-form-item>
 
-          <el-form-item
-            label="乙方地址："
-            prop="partbAddress"
-          >
+          <el-form-item label="乙方地址：" prop="partbAddress">
             {{ form.partbAddress }}
           </el-form-item>
-        
         </el-col>
       </el-row>
     </el-form>
@@ -209,11 +158,12 @@
       :contractBookType="form.type"
       :pricingWay="form.pricingWay"
       :isChangeCount="false"
+      :isArrivalWay="true"
       :countObj="{
-              countKey: 'contractCount',
-              unitKey: 'contractUnit',
-              unitIdKey: 'contractUnitId'
-            }"
+        countKey: 'contractCount',
+        unitKey: 'contractUnit',
+        unitIdKey: 'contractUnitId'
+      }"
     >
     </inventoryTabledetail>
 
@@ -258,7 +208,7 @@
   export default {
     mixins: [dictMixins],
     components: {
-      inventoryTabledetail,
+      inventoryTabledetail
       // fileMain
     },
     props: {
@@ -329,7 +279,7 @@
             label: '款项类型',
             align: 'center',
             formatter: (_row, _column, cellValue) => {
-              return payType.find(item=>item.value==_row.type)?.label
+              return payType.find((item) => item.value == _row.type)?.label;
             }
           },
           {
@@ -556,8 +506,8 @@
       margin-bottom: 10px;
     }
   }
-  :deep(.el-form-item){
-    margin-bottom:4px;
+  :deep(.el-form-item) {
+    margin-bottom: 4px;
   }
   .headbox {
     display: flex;

src/views/bpm/handleTask/components/materialPlan/detailDialog.vue

@@ -47,7 +47,7 @@
                 </el-link>
               </template>
 
-              
+
 
 
 
@@ -84,7 +84,7 @@
     <timeDialog ref="timeDialogRef"></timeDialog>
   </div>
 </template>
-  
+
 <script>
 import { getById } from '@/api/bpm/components/materialPlan/index';
 import { getFile } from '@/api/system/file';
@@ -244,11 +244,11 @@ export default {
           align: 'center',
         },
 
-        {
-          label: '采购数量',
-          prop: 'purchaseQuantity',
-          align: 'center'
-        },
+        // {
+        //   label: '采购数量',
+        //   prop: 'purchaseQuantity',
+        //   align: 'center'
+        // },
 
         {
           label: '到货方式',
@@ -326,7 +326,7 @@ export default {
   }
 };
 </script>
-  
+
 <style lang="scss" scoped>
 :deep(.el-table__expanded-cell) {
 

src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

@@ -22,9 +22,7 @@
             <el-form-item label="订单编号：" prop="orderNo">
               {{ form.orderNo }}
             </el-form-item>
-            <el-form-item label="合同编号：" prop="contractNumber">
-              {{ form.contractNumber }}
-            </el-form-item>
+
             <el-form-item label="订单类型：" prop="totalAmount">
               {{
                 form.needProduce == 1
@@ -46,8 +44,33 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="项目名称：" prop="projectName">
-              {{ form.projectName }}
+            <el-form-item
+              v-if="form.relationType == 1"
+              label="商机名称："
+              prop="relationName"
+            >
+              {{ form.relationName }}
+            </el-form-item>
+            <el-form-item
+              v-if="form.relationType == 2"
+              label="报价单："
+              prop="relationCode"
+            >
+              {{ form.relationName }}
+            </el-form-item>
+            <el-form-item
+              v-if="form.relationType == 4"
+              label="项目名称："
+              prop="projectName"
+            >
+              {{ form.relationName }}
+            </el-form-item>
+            <el-form-item
+              v-if="form.relationType == 3"
+              label="合同名称："
+              prop="relationName"
+            >
+              {{ form.relationName }}
             </el-form-item>
             <el-form-item label="销售部门：" prop="salesDeptName">
               {{ form.salesDeptName }}
@@ -61,10 +84,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="合同名称：" prop="contractName">
-              {{ form.contractName }}
+            <el-form-item
+              label="合同编号："
+              prop="contractNumber"
+              v-if="form.relationType == 3"
+            >
+              {{ form.contractNumber }}
             </el-form-item>
-
             <el-form-item label="销售类型：" prop="saleTypeName">
               {{ form.saleTypeName }}
             </el-form-item>

src/views/bpm/processInstance/detail.vue

@@ -12,7 +12,6 @@
     :maxable="true"
     :resizable="true"
   >
-
     <div class="app-container" style="padding: 15px">
       <!-- 审批记录 -->
       <el-card class="box-card" v-loading="tasksLoad">
@@ -32,32 +31,41 @@
                 <el-card :body-style="{ padding: '10px' }">
                   <label
                     v-if="item.assigneeUser"
-                    style="font-weight: normal; margin-right: 30px">
-                    {{index==0?' 审批人':'发起人' }}：{{ item.assigneeUser.nickname }}
+                    style="font-weight: normal; margin-right: 30px"
+                  >
+                    {{ index == 0 ? ' 审批人' : '发起人' }}：{{
+                      item.assigneeUser.nickname
+                    }}
                     <el-tag type="info" size="mini">{{
                       item.assigneeUser.deptName
                     }}</el-tag>
                   </label>
                   <label style="font-weight: normal" v-if="item.createTime"
-                    >创建时间：</label>
+                    >创建时间：</label
+                  >
                   <label style="color: #8a909c; font-weight: normal">{{
                     item.createTime
                   }}</label>
                   <label
                     v-if="item.endTime"
                     style="margin-left: 30px; font-weight: normal"
-                    >审批时间：</label>
+                    >审批时间：</label
+                  >
                   <label
                     v-if="item.endTime"
-                    style="color: #8a909c; font-weight: normal">
-                    {{ item.endTime }}</label>
+                    style="color: #8a909c; font-weight: normal"
+                  >
+                    {{ item.endTime }}</label
+                  >
                   <label
                     v-if="item.durationInMillis"
                     style="margin-left: 30px; font-weight: normal"
-                    >耗时：</label>
+                    >耗时：</label
+                  >
                   <label
                     v-if="item.durationInMillis"
-                    style="color: #8a909c; font-weight: normal">
+                    style="color: #8a909c; font-weight: normal"
+                  >
                     {{ getDateStar(item.durationInMillis) }}
                   </label>
                   <p v-if="item.reason">
@@ -78,7 +86,6 @@
         </div>
 
         <my-process-viewer
-        
           key="designer"
           v-model="bpmnXML"
           v-bind="bpmnControlForm"
@@ -143,6 +150,15 @@
         this.dialogVisible = true;
         this.getDetail();
       },
+      getChildren(data) {
+        let arr = [];
+        console.log(data, 'data');
+        arr.push(...data);
+        if (data.children) {
+          this.getChildren(data.children);
+        }
+        return arr;
+      },
       /** 获得流程实例 */
       getDetail() {
         // 获得流程实例相关
@@ -185,8 +201,10 @@
           this.tasks = [];
           // 移除已取消的审批
           response.forEach((task) => {
-            // if (task.result !== 4) {
-              this.tasks.push(task);
+            if (task.children.length > 0) {
+              this.tasks.push(...this.getChildren(task.children));
+            }
+            this.tasks.push(task);
             // }
           });
           // 排序，将未完成的排在前面，已完成的排在后面；

src/views/bpm/processInstance/detailNew.vue

@@ -154,6 +154,15 @@
       this.getDetail();
     },
     methods: {
+      getChildren(data) {
+        let arr = [];
+        arr.push(...data);
+        if (data.children) {
+          this.getChildren(data.children);
+        }
+        return arr;
+      },
+
       /** 获得流程实例 */
       getDetail() {
         // 获得流程实例相关
@@ -182,6 +191,7 @@
           getActivityList({
             processInstanceId: this.processInstance.id
           }).then((response) => {
+            
             this.activityList = response;
           });
 
@@ -194,8 +204,12 @@
         getTaskListByProcessInstanceId(this.id).then((response) => {
           // 审批记录
           this.tasks = [];
+          // console.log(response,'response')
           // 移除已取消的审批
           response.forEach((task) => {
+            if (task.children.length > 0) {
+              this.tasks.push(...this.getChildren(task.children));
+            }
             // if (task.result !== 4) {
             this.tasks.push(task);
             // }

vue.config.js

@@ -38,9 +38,13 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
+
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.144:18086',
         target: 'http://192.168.1.125:18086',
+
+        // target: 'http://192.168.1.251:18186',
+
         changeOrigin: true, // 只有这个值为true的情况下 s才表示开启跨域
         pathRewrite: {
           '^/api': ''