修改

src/api/warehouseManagement/index.js

@@ -73,6 +73,14 @@ export default {
     }
     return Promise.reject(new Error(res.data.message));
   },
+  // 获取入库详情
+  getInboundDetailsByBizNo: async (id) => {
+    const res = await request.get(`/wms/outintwo/getInfoByBizNo/${id}`);
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+  },
   // 删除入库详情
   delete: async (data) => {
     const res = await request.delete('/wms/outintwo/delete', { data });
@@ -422,5 +430,25 @@ export default {
       return res.data.data;
     }
     return Promise.reject(new Error(res.data.message));
+  },
+  // 台账详情调拨列表
+  getAllotDetails: async (data) => {
+    const res = await request.get(`/wms/allotDetail/page`, {
+      params: data
+    });
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+  },
+  // 台账详情盘点列表
+  getPlandetails: async (data) => {
+    const res = await request.get(`/wms/plandetail/page`, {
+      params: data
+    });
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
   }
 };

src/components/print/indexMultiple.vue

@@ -172,8 +172,7 @@
             </div>
             <div class="vue-qr">
               <vue-qr
-                :logoSrc="item.imagePath"
-                :text="item.qrCode ? item.qrCode : ''"
+                :text="item.value ? item.value : ''"
                 class="vueQrSize"
               ></vue-qr>
             </div>
@@ -335,8 +334,7 @@
               </div>
               <div class="vue-qr">
                 <vue-qr
-                  :logoSrc="item.imagePath"
-                  :text="item.qrCode ? item.qrCode : ''"
+                  :text="item.value ? item.value : ''"
                   class="vueQrSize"
                 ></vue-qr>
               </div>
@@ -378,6 +376,10 @@
         fontTypeObj: { 1: '宋体', 2: '微软雅黑', 3: 'Arial' }
       };
     },
+    mouthed() {
+      console.log('----------');
+      console.log(this.config);
+    },
     methods: {
       //打印
       Print() {

src/views/warehouseManagement/inventoryAllocation/details.vue

@@ -52,21 +52,7 @@
           </el-form>
         </div>
       </div>
-      <div
-        v-if="infoData.type == 2"
-        class="content-detail mt20"
-        style="height: 500px"
-      >
-        <HeaderTitle title="流程图" size="16px"></HeaderTitle>
-        <my-process-viewer
-          key="designer"
-          v-model="bpmnXML"
-          v-bind="bpmnControlForm"
-          :activityData="activityList"
-          :processInstanceData="processInstance"
-          :taskData="tasks"
-        />
-      </div>
+
       <div class="content-detail mt20">
         <HeaderTitle title="调拨明细" size="16px"></HeaderTitle>
         <div class="mt20">
@@ -198,6 +184,21 @@
           </el-table>
         </div>
       </div>
+      <div
+        v-if="infoData.type == 2"
+        class="content-detail mt20"
+        style="height: 450px"
+      >
+        <HeaderTitle title="流程图" size="16px"></HeaderTitle>
+        <my-process-viewer
+          key="designer"
+          v-model="bpmnXML"
+          v-bind="bpmnControlForm"
+          :activityData="activityList"
+          :processInstanceData="processInstance"
+          :taskData="tasks"
+        />
+      </div>
     </div>
   </div>
 </template>

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -606,10 +606,14 @@
         });
       },
       async _getInfo() {
-        const res = await storageApi.getInboundDetailsById(
-          this.$route.query.id
-        );
-        console.log('===', res);
+        let res = null;
+        if (this.$route.query.id) {
+          res = await storageApi.getInboundDetailsById(this.$route.query.id);
+        } else {
+          res = await storageApi.getInboundDetailsByBizNo(
+            this.$route.query.bizNo
+          );
+        }
         this.infoData = res;
         this.extInfo = res.extInfo;
         this.productList = res.outInDetailList.map(

src/views/warehouseManagement/picking/index.vue

@@ -19,6 +19,11 @@
             row.code
           }}</el-link>
         </template> -->
+        <template v-slot:outInNo="{ row }">
+          <el-link @click="details(row.outInNo)">
+            {{ row.outInNo }}
+          </el-link>
+        </template>
         <template v-slot:action="{ row }">
           <el-link
             v-if="row.status == 0"
@@ -113,6 +118,7 @@
             minWidth: 110
           },
           {
+            slot: 'outInNo',
             prop: 'outInNo',
             label: '出库单号',
             align: 'center',
@@ -164,6 +170,14 @@
     },
     computed: {},
     methods: {
+      details(id) {
+        this.$router.push({
+          path: '/warehouseManagement/outgoingManagement/details',
+          query: {
+            bizNo: id
+          }
+        });
+      },
       // 删除
       async deleted(row) {
         const data = await storageApi.deletePickgoods([row.id]);

src/views/warehouseManagement/stockLedger/batchDetails.vue

@@ -81,6 +81,7 @@
     data() {
       return {
         activeName: 'zero',
+        categoryId: '',
         tableData: {
           first: [],
           second: [],
@@ -107,11 +108,11 @@
       },
       baseParams() {
         return {
-          inventoryCode: this.baseInfo.assetCode,
+          // inventoryCode: this.baseInfo.assetCode,
           // // name: this.baseInfo.assetName,
           // // warehousingType: _warehousingType(this.baseInfo.assetType)
           // //   .warehousingType,
-          batchNum: this.baseInfo.batchNum
+          categoryId: this.categoryId
         };
       }
     },
@@ -124,6 +125,7 @@
         const res = await getDetails(row.id);
         this.$nextTick(() => {
           console.log(res);
+          this.categoryId = res.categoryWms && res.categoryWms.categoryId;
           this.$refs.baseInfoRef.getDetailInfoAugr(res.category); //基本信息
           this.$refs.warehouseConfigRef.getDetailInfoAugr(res.categoryWms);
         });

src/views/warehouseManagement/stockLedger/components/details/InventoryAllocation.vue

@@ -32,49 +32,43 @@
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
     >
       <el-table-column label="序号" type="index"></el-table-column>
-      <!-- <el-table-column
-        :label="`${getDictValue('类型用途', baseInfo.assetType)}编码`"
-        prop="onlyCode"
-      ></el-table-column> -->
-      <el-table-column label="包装编码" prop="num"></el-table-column>
+      <el-table-column label="调拔单号" prop="code"></el-table-column>
+      <el-table-column label="调拔名称" prop="name"></el-table-column>
+      <el-table-column label="物品名称" prop="categoryName"></el-table-column>
+      <el-table-column label="批次号" prop="batchNo"></el-table-column>
+      <el-table-column label="包装编码" prop="packageNo"></el-table-column>
       <el-table-column
-        label="最小包装单元"
-        align="center"
-        prop=""
-        v-if="!baseInfo.isUnpack"
-      >
-        <template slot-scope="{ row }">{{
-          `${row.measurementUnit || ''}${row.unit}/${row.minPackUnit}`
-        }}</template>
-      </el-table-column>
+        label="包装数量"
+        prop="packingQuantity"
+      ></el-table-column>
+      <el-table-column label="包装单位" prop="packingUnit"></el-table-column>
       <el-table-column
-        label="批次号"
-        prop="batchNo"
-        v-if="$route.query.dimension == 1"
+        label="计量数量"
+        prop="measureQuantity"
       ></el-table-column>
-      <el-table-column label="调拔单号" prop="dialNumber"></el-table-column>
-
-      <el-table-column label="调出货位" prop="warehouseName">
+      <el-table-column label="计量单位" prop="measureUnit"></el-table-column>
+      <el-table-column label="重量" prop="weight"></el-table-column>
+      <el-table-column label="重量单位" prop="weightUnit"></el-table-column>
+      <el-table-column label="调出区域" prop="warehouseName">
         <template slot-scope="{ row }">
-          {{ row.warehouseName }} - {{ row.outWarehouseAreaName }} -
-          {{ row.outWarehouseAreaGoodsCode }} - {{ row.outGoodsAllocationCode }}
+          {{ warehouseLabel(row) }}
         </template>
       </el-table-column>
-      <el-table-column label="调入货位" prop="inWarehouseName">
+      <el-table-column label="调入区域" prop="inWarehouseName">
         <template slot-scope="{ row }">
-          {{ row.inWarehouseName }} - {{ row.inWarehouseAreaName }} -
-          {{ row.inWarehouseAreaGoodsCode }} - {{ row.inGoodsAllocationCode }}
+          {{ targetWarehouseLabel(row) }}
         </template>
       </el-table-column>
-      <el-table-column label="审核时间" prop="auditorTime"></el-table-column>
+      <el-table-column label="创建时间" prop="createTime"></el-table-column>
     </el-table>
-    <Pagination
-      class="pagination"
-      :total="total"
-      :page.sync="page"
-      :size.sync="size"
-      @pagination="handlePageChange"
-    />
+    <div class="pagination"
+      ><Pagination
+        :total="total"
+        :page.sync="page"
+        :size.sync="size"
+        @pagination="handlePageChange"
+    /></div>
+
     <!-- <InventoryAllocationDialog
       ref="detailRef"
       :assetCode="baseInfo.assetCode"
@@ -84,6 +78,7 @@
 </template>
 
 <script>
+  import storageApi from '@/api/warehouseManagement';
   import Pagination from '@/components/Pagination';
   // import { getTransferDetail } from '@/api/stockManagement/stockLedger'
   import InventoryAllocationDialog from './InventoryAllocationDialog';
@@ -108,16 +103,76 @@
           key: ''
         },
         tableData: [],
-        size: 15,
+        size: 10,
         page: 1,
         total: 0
       };
     },
     created() {
       // this.requestDict('类型用途')
-      // this.getList()
+      this.getList();
     },
     methods: {
+      warehouseLabel(row) {
+        if (
+          row.warehouseName &&
+          row.areaName &&
+          row.goodsShelfName &&
+          row.goodsAllocationName
+        ) {
+          return (
+            row.warehouseName +
+            '/' +
+            row.areaName +
+            '/' +
+            row.goodsShelfName +
+            '/' +
+            row.goodsAllocationName
+          );
+        } else if (row.warehouseName && row.areaName && row.goodsShelfName) {
+          return (
+            row.warehouseName + '/' + row.areaName + '/' + row.goodsShelfName
+          );
+        } else if (row.warehouseName && row.areaName) {
+          return row.warehouseName + '/' + row.areaName;
+        } else {
+          return row.warehouseName;
+        }
+      },
+      targetWarehouseLabel(row) {
+        if (
+          row.targetWarehouseName &&
+          row.targetAreaName &&
+          row.targetGoodsShelfName &&
+          row.targetGoodsAllocationName
+        ) {
+          return (
+            row.targetWarehouseName +
+            '/' +
+            row.targetAreaName +
+            '/' +
+            row.targetGoodsShelfName +
+            '/' +
+            row.targetGoodsAllocationName
+          );
+        } else if (
+          row.targetWarehouseName &&
+          row.targetAreaName &&
+          row.targetGoodsShelfName
+        ) {
+          return (
+            row.targetWarehouseName +
+            '/' +
+            row.targetAreaName +
+            '/' +
+            row.targetGoodsShelfName
+          );
+        } else if (row.targetWarehouseName && row.targetAreaName) {
+          return row.targetWarehouseName + '/' + row.targetAreaName;
+        } else {
+          return row.targetWarehouseName;
+        }
+      },
       search() {
         this.page = 1;
         this.getList();
@@ -133,22 +188,16 @@
         this.getList();
       },
       async getList() {
-        const res = await inventorybookPage({
-          size: this.size,
-          page: this.page,
-          bizStatus: 3
-          // ...this.baseParams,
-          // ...this.searchForm,
-          // batchNum: this.baseParams.batchNum || this.searchForm.batchNum
-          // bizNum,
-          // batchNum,
-          // inventoryCode: this.assetCode
-        });
-        if (res?.success) {
-          // this.tableData = res.data
-          this.tableData = res.data.records;
-          this.total = res.data.total;
-        }
+        storageApi
+          .getAllotDetails({
+            size: this.size,
+            pageNum: this.page,
+            ...this.baseParams
+          })
+          .then((res) => {
+            this.tableData = res.list;
+            this.total = res.count;
+          });
       }
     }
   };
@@ -170,9 +219,9 @@
       }
     }
     .pagination {
-      flex: 0 0 50px;
       display: flex;
       align-items: center;
+      justify-content: center;
     }
   }
 </style>

src/views/warehouseManagement/stockLedger/components/details/ReportLoss.vue

@@ -21,29 +21,10 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
-          <!-- <el-form-item
-            :label="`${getDictValue('类型用途', baseInfo.assetType)}编码`"
-            prop="assetCode"
-          >
-            <el-input
-              v-model="searchForm.assetCode"
-              placeholder="请输入"
-              size="small"
-            ></el-input>
-          </el-form-item> -->
-          <el-form-item label="物品类型" prop="assetCode">
-            <el-input
-              v-model="searchForm.assetCode"
-              placeholder="请输入"
-              size="small"
-            ></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="5">
           <el-form-item label="盘点工单号" prop="workOrderCode">
             <el-input
-              v-model="searchForm.workOrderCode"
+              v-model="searchForm.planOrderCode"
               placeholder="请输入"
               size="small"
             ></el-input>
@@ -52,7 +33,7 @@
         <el-col :span="5">
           <el-form-item label="报损溢单号" prop="breakageCode">
             <el-input
-              v-model="searchForm.breakageCode"
+              v-model="searchForm.planProfitLossCode"
               placeholder="请输入"
               size="small"
             ></el-input>
@@ -77,46 +58,21 @@
       :data="tableData"
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
     >
-      <el-table-column label="序号" type="index">
-        <template slot-scope="{ $index }">
-          {{ $tableIndex($index, page, size) }}
-        </template>
-      </el-table-column>
-      <!-- <el-table-column
-        :label="`${getDictValue('类型用途', baseInfo.assetType)}编码`"
-        prop="onlyCode"
-        width="200"
-      ></el-table-column> -->
-      <!-- <el-table-column label="包装编码" prop="num"></el-table-column> -->
       <el-table-column
-        label="最小包装单元"
-        prop=""
-        v-if="!baseInfo.isUnpack"
-        align="center"
-        width="150"
-      >
-        <template slot-scope="{ row }">
-          {{ row.measurementUnit }}{{ row.unit }} /{{ row.minimumUnit }}
-        </template>
-      </el-table-column>
+        label="盘点工单号"
+        width="220"
+        prop="planOrderCode"
+      ></el-table-column>
       <el-table-column
-        label="批次号"
-        prop="batch"
-        v-if="dimension != 2"
+        width="200"
+        label="物品名称"
+        prop="categoryName"
       ></el-table-column>
-      <el-table-column label="单价" prop="">
-        <template slot-scope="{ row }">
-          <template v-if="row.univalence || row.univalence === 0">
-            {{ row.univalence }} {{ priceList[row.univalenceUnit] }}
-          </template>
-        </template></el-table-column
-      >
+      <el-table-column label="批次号" prop="batchNo"></el-table-column>
       <el-table-column
-        label="盘点工单号"
-        width="220"
-        prop="workOrderCode"
+        label="盘点人"
+        prop="planOrderUserName"
       ></el-table-column>
-      <el-table-column label="盘点人" prop="executeUserName"></el-table-column>
       <el-table-column label="盈/损/亏" prop="">
         <template slot-scope="{ row }">
           <span :style="{ color: statusColor[row.status] }">{{
@@ -124,33 +80,38 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="数量">
+        <template slot-scope="{ row }">
+          <span>{{ row[countKey[row.status]] }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="报损溢单号"
         width="220"
-        prop="breakageOverflowCode"
+        prop="planProfitLossCode"
       ></el-table-column>
-      <el-table-column label="操作人" prop="reportName"></el-table-column>
       <el-table-column
-        label="审核人"
-        prop="accraditationUserName"
+        label="报损报溢人"
+        prop="planProfitLossUserName"
       ></el-table-column>
       <el-table-column
-        label="更新库存时间"
-        prop="updateInventoryTime"
+        label="审核时间"
+        prop="auditTime"
         width="150"
       ></el-table-column>
     </el-table>
-    <Pagination
-      class="pagination"
-      :total="total"
-      :page.sync="page"
-      :size.sync="size"
-      @pagination="handlePageChange"
-    />
+    <div class="pagination"
+      ><Pagination
+        :total="total"
+        :page.sync="page"
+        :size.sync="size"
+        @pagination="handlePageChange"
+    /></div>
   </div>
 </template>
 
 <script>
+  import storageApi from '@/api/warehouseManagement';
   import Pagination from '@/components/Pagination';
   // import { getBreakageOverflowDetail } from '@/api/stockManagement/stockLedger'
   // import dictMixin from '@/mixins/dictMixins'
@@ -158,10 +119,6 @@
     components: { Pagination },
     // mixins: [dictMixin],
     props: {
-      baseInfo: {
-        type: Object,
-        default: () => ({})
-      },
       baseParams: {
         type: Object,
         default: () => ({})
@@ -171,35 +128,39 @@
       return {
         searchForm: {
           status: '',
-          assetCode: '',
-          workOrderCode: '',
-          breakageCode: ''
+          planOrderCode: '',
+          planProfitLossCode: ''
         },
         statusList: [
           { label: '所有', code: '' },
-          { label: '盘盈', code: 3 },
-          { label: '盘损', code: 2 },
-          { label: '盘亏', code: 1 }
+          { label: '盘盈', code: 2 },
+          { label: '盘亏', code: 3 },
+          { label: '盘损', code: 4 }
         ],
         statusOpt: {
-          1: '盘亏',
-          2: '盘损',
-          3: '盘盈'
+          2: '盘盈',
+          3: '盘亏',
+          4: '盘损'
+        },
+        countKey: {
+          2: 'surplusQuantity',
+          3: 'loseQuantity',
+          4: 'wornQuantity'
         },
         statusColor: {
-          1: '',
-          2: '#F59A23',
-          3: '#70B603'
+          2: 'red',
+          3: '#70B603',
+          4: ''
         },
         tableData: [],
-        size: 15,
+        size: 10,
         page: 1,
         total: 0
       };
     },
     created() {
       // this.requestDict('类型用途')
-      // this.getList()
+      this.getList();
     },
     computed: {
       dimension() {
@@ -219,18 +180,18 @@
         this.getList();
       },
       async getList() {
-        const res = await getBreakageOverflowDetail({
-          size: this.size,
-          page: this.page,
-          informationId: this.baseInfo.materialId,
-          ...this.searchForm,
-          ...this.baseParams,
-          batchNum: this.baseParams.batchNum || this.searchForm.batchNum
-        });
-        if (res?.success) {
-          this.tableData = res.data.records;
-          this.total = res.data.total;
-        }
+        console.log(this.baseParams);
+        storageApi
+          .getPlandetails({
+            size: this.size,
+            pageNum: this.page,
+            ...this.baseParams,
+            ...this.searchForm
+          })
+          .then((res) => {
+            this.tableData = res.list;
+            this.total = res.count;
+          });
       }
     }
   };
@@ -252,9 +213,9 @@
       }
     }
     .pagination {
-      flex: 0 0 50px;
       display: flex;
       align-items: center;
+      justify-content: center;
     }
   }
 </style>

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -457,14 +457,15 @@
             };
           });
           barCode.batchBarPrint(params).then((res) => {
+            console.log('--------res---------------');
             console.log(res);
             this.config = [];
-            res.map((item) => {
+            res.map((item, index) => {
               let obj = {
                 putType: item.putType,
                 sizeWide: item.sizeWide,
                 sizeLong: item.sizeLong,
-                value: item.qrCode,
+                value: this.checkRadioData[index].packageNo + '/6',
                 useModeList: item.useModeList
               };
               obj.useModeList = obj.useModeList.sort((a, b) => {

src/views/warehouseManagement/stockLedger/components/item-search.vue

@@ -9,6 +9,23 @@
       @submit.native.prevent
     >
       <el-row :gutter="15">
+        <el-col :span="6">
+          <el-form-item label="所属工厂" prop="factoryId">
+            <el-select
+              filterable
+              placeholder="请选择"
+              v-model="params.factoryId"
+              clearable
+              class="w100"
+            >
+              <el-option
+                v-for="item in factoryList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select> </el-form-item
+        ></el-col>
         <el-col v-if="type === 'products'" :span="6">
           <el-form-item label="仓库:" prop="warehouseId">
             <template>
@@ -29,6 +46,14 @@
             </template>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="组织机构:">
+            <auth-selection
+              v-model="params.deptIds"
+              style="width: 100%"
+            ></auth-selection>
+          </el-form-item>
+        </el-col>
         <el-col v-if="type === 'products'" :span="6">
           <el-form-item label="列表维度:" prop="dimension">
             <template>
@@ -46,8 +71,16 @@
             </template>
           </el-form-item>
         </el-col>
-
         <el-col :span="6">
+          <el-form-item label="关键词:" prop="keyWord">
+            <el-input
+              clearable
+              placeholder="请输入"
+              v-model.trim="params.keyWord"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="6">
           <el-form-item label="物品编码:" prop="categoryCode">
             <el-input
               clearable
@@ -119,33 +152,8 @@
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="组织机构:">
-            <auth-selection
-              v-model="params.deptIds"
-              style="width: 100%"
-            ></auth-selection>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="所属工厂" prop="factoryId">
-            <el-select
-              filterable
-              placeholder="请选择"
-              v-model="params.factoryId"
-              clearable
-              class="w100"
-            >
-              <el-option
-                v-for="item in factoryList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select> </el-form-item
-        ></el-col>
-        <el-col>
+        </el-col> -->
+        <el-col :span="18">
           <div class="ele-form-actions">
             <el-button
               type="primary"
@@ -178,7 +186,6 @@
       const defaultParams = {
         batchNo: '',
         informationName: '',
-        warehouseId: '',
         manualBatchNo: '',
         barcodes: '',
         engrave: '',
@@ -189,7 +196,10 @@
         categoryCode: '',
         assetName: '',
         qualityResult: '',
-        factoryId: ''
+        factoryId: '',
+        keyWord: '',
+        deptIds: '',
+        warehouseId: ''
       };
       return {
         // 表单数据

src/views/warehouseManagement/stockManagement/add.vue

@@ -2574,6 +2574,7 @@
         console.log('计量单位----', row.measureUnit);
         console.log('包装数量----', row.packingQuantity);
         console.log('包装编码----', packingCodeList);
+        console.log('包装数据----', row);
         let packingList = [];
         let obj = this.getNowDate();
         let productionDate = '';

src/views/warehouseManagement/stocktaking/reportLoss/components/addReportDialog.vue

@@ -95,25 +95,13 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div v-if="addForm.status != 0" style="height: 300px">
-        <HeaderTitle title="流程图" size="16px"></HeaderTitle>
-        <my-process-viewer
-          key="designer"
-          v-model="bpmnXML"
-          v-bind="bpmnControlForm"
-          :activityData="activityList"
-          :processInstanceData="processInstance"
-          :taskData="tasks"
-        />
-      </div>
-
       <HeaderTitle title="报损报溢工单物品信息" size="16px">
         <el-button
           v-if="!isBindPlan"
           style="margin-left: 10px"
           type="primary"
           @click="addProducts"
-          >添加物品</el-button
+          >选择工单</el-button
         >
       </HeaderTitle>
       <el-table
@@ -269,6 +257,17 @@
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="addForm.status != 0" style="height: 350px">
+        <HeaderTitle title="流程图" size="16px"></HeaderTitle>
+        <my-process-viewer
+          key="designer"
+          v-model="bpmnXML"
+          v-bind="bpmnControlForm"
+          :activityData="activityList"
+          :processInstanceData="processInstance"
+          :taskData="tasks"
+        />
+      </div>
     </el-form>
     <div v-if="!isBindPlan" slot="footer">
       <el-button

vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
-        target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.251:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''