Explorar el Código

Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

wsx hace 1 año
padre
commit
160ea5b87c
Se han modificado 38 ficheros con 517 adiciones y 84 borrados
  1. 26 2
      src/BIZComponents/innerdetails.vue
  2. 11 0
      src/BIZComponents/processSubmitDialog/processSubmitDialog.vue
  3. 26 4
      src/api/saleManage/saleorder.js
  4. 13 3
      src/components/timeDialog/index.vue
  5. 116 0
      src/components/timeDialog/indexAll.vue
  6. 4 4
      src/views/purchasingManage/producerManage/components/contactDetailDialog.vue
  7. 47 5
      src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue
  8. 2 2
      src/views/purchasingManage/purchaseOrder/accountstatement/index.vue
  9. 7 2
      src/views/purchasingManage/purchaseOrder/components/detailDialog.vue
  10. 2 2
      src/views/purchasingManage/purchaseOrder/invoice/index.vue
  11. 2 2
      src/views/purchasingManage/purchaseOrder/orderAssociation/accountstatementList.vue
  12. 2 2
      src/views/purchasingManage/purchaseOrder/orderAssociation/invoiceList.vue
  13. 200 0
      src/views/purchasingManage/purchaseOrder/orderAssociation/outSourceSendList.vue
  14. 2 2
      src/views/purchasingManage/purchaseOrder/outSourceSend/index.vue
  15. 2 2
      src/views/purchasingManage/purchaseOrder/returnGoods/index.vue
  16. 4 4
      src/views/purchasingManage/supplierManage/components/contactDetailDialog.vue
  17. 4 2
      src/views/saleManage/businessOpportunity/components/addFollowDialog.vue
  18. 4 2
      src/views/saleManage/businessOpportunity/components/followDetailDialog.vue
  19. 4 5
      src/views/saleManage/businessOpportunity/components/followList.vue
  20. 1 1
      src/views/saleManage/contact/components/certificateManagement/components/add-dialog.vue
  21. 4 4
      src/views/saleManage/contact/components/contactDetailDialog.vue
  22. 2 2
      src/views/saleManage/saleOrder/accountstatement/index.vue
  23. 2 2
      src/views/saleManage/saleOrder/customerReturnOrder/index.vue
  24. 2 2
      src/views/saleManage/saleOrder/customerReturnOrder/returnOrderDialog.vue
  25. 2 2
      src/views/saleManage/saleOrder/entrustedReceive/index.vue
  26. 2 2
      src/views/saleManage/saleOrder/invoice/index.vue
  27. 2 2
      src/views/saleManage/saleOrder/invoiceConfirm/components/sendListDialog.vue
  28. 2 2
      src/views/saleManage/saleOrder/invoiceConfirm/index.vue
  29. 2 2
      src/views/saleManage/saleOrder/orderAssociation/accountstatementList.vue
  30. 2 2
      src/views/saleManage/saleOrder/orderAssociation/invoiceList.vue
  31. 2 2
      src/views/saleManage/saleOrder/orderAssociation/returnGoodsList.vue
  32. 2 2
      src/views/saleManage/saleOrder/returnGoods/components/sendListDialog.vue
  33. 3 3
      src/views/saleManage/saleOrder/returnGoods/components/sendListMultipleDialog.vue
  34. 2 2
      src/views/saleManage/saleOrder/returnGoods/index.vue
  35. 2 2
      src/views/salesServiceManagement/components/invoiceDialog.vue
  36. 2 2
      src/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue
  37. 2 2
      src/views/transportManager/shipManage/taskWorkManage/components/sendListDialog.vue
  38. 1 1
      vue.config.js

+ 26 - 2
src/BIZComponents/innerdetails.vue

@@ -234,6 +234,24 @@
               :show-overflow-tooltip="true"
             >
             </el-table-column>
+            <el-table-column
+              label="生产日期"
+              prop="detailProductionDate"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
+            <el-table-column
+              label="采购日期"
+              prop="detailPurchaseDate"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
+            <el-table-column
+              label="失效日期"
+              prop="detailExpireDate"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
           </el-table>
         </div>
         <div class="mt20">
@@ -383,9 +401,15 @@
               :show-overflow-tooltip="true"
             >
             </el-table-column>
+            <el-table-column
+              label="失效日期"
+              prop="expireDate"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
           </el-table>
         </div>
-        <div class="mt20">
+        <!-- <div class="mt20">
           <header-title :title="`物料明细`" size="16px"> </header-title>
           <el-table
             ref="multipleTable"
@@ -451,7 +475,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
   </div>

+ 11 - 0
src/BIZComponents/processSubmitDialog/processSubmitDialog.vue

@@ -211,6 +211,10 @@
       apiFunName: {
         type: String,
         default: ''
+      },
+      callBack: {
+        type: Function,
+        default: ''
       }
     },
     data() {
@@ -440,6 +444,13 @@
         });
       },
       async submit() {
+        let code = 0;
+        if (this.callBack) {
+          code = await this.callBack();
+        }
+        if (code != 0) {
+          return;
+        }
         await processInstanceCreateAPI(this.form);
         this.$message('提交审核成功');
         this.$emit('reload');

+ 26 - 4
src/api/saleManage/saleorder.js

@@ -36,7 +36,9 @@ export async function getWarehouseList() {
  * 查询库存仓库列表
  */
 export async function getIdWarehouseList(params) {
-  const res = await request.get(`/wms/outindetailtwo/getBatchWarehouseList`, { params });
+  const res = await request.get(`/wms/outindetailtwo/getBatchWarehouseList`, {
+    params
+  });
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -46,7 +48,9 @@ export async function getIdWarehouseList(params) {
  * 查询库存可用数
  */
 export async function getWarehouseOutStock(params) {
-  const res = await request.get(`/wms/stocktwo/getWarehouseOutStock`, { params });
+  const res = await request.get(`/wms/stocktwo/getWarehouseOutStock`, {
+    params
+  });
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -143,7 +147,7 @@ export async function submit(data) {
 /**
  * 摘要卡片
  */
- export async function queryOrderNoCount(code) {
+export async function queryOrderNoCount(code) {
   const res = await request.get(`/eom/saleorder/queryOrderNoCount/${code}`, {});
   if (res.data.code == 0) {
     return res.data.data;
@@ -153,10 +157,28 @@ export async function submit(data) {
 /**
  * 催单
  */
- export async function saleOrderReminder(id) {
+export async function saleOrderReminder(id) {
   const res = await request.get(`/eom/saleorder/saleOrderReminder/${id}`, {});
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
+/**
+ * 获bom清单
+ */
+export async function getByRepeatBomAttribute(id) {
+  const res = await request.get(`/eom/saleorder/getByRepeatBomAttribute/${id}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 保存bom清单
+ */
+export async function saveOrderBomList(data) {
+  const res = await request.post(`/eom/saleorder/saveOrderBomList`,data);
+  return res.data.code
+  // return Promise.reject(new Error(res.data.message));
+}

+ 13 - 3
src/components/timeDialog/index.vue

@@ -22,7 +22,7 @@
         v-if="!view"
         >新增
       </el-button>
-      <span style="margin-left: 10px"
+      <span style="margin-left: 10px" v-if="!isAll"
         >待分配数量:<span style="color: #1890ff">{{ count }}</span></span
       >
       <el-table
@@ -117,11 +117,18 @@
       },
       isBatch: {
         default: false
+      },
+      isAll: {
+        default: false
       }
     },
     computed: {
       getCountMax() {
+    
         return (row) => {
+          if (this.isAll) {
+          return 100000000;
+        }
           let maxCount = this.current.totalCount * 1 || 0;
           let usedCount = this.form.arrivalBatch.reduce((n, item) => {
             n += item.arriveCount * 1;
@@ -206,10 +213,13 @@
       },
 
       handleOk() {
-        if (this.count !== 0)
+        if (this.count !== 0&&!this.isAll)
           return this.$message.warning('分配数量有误,请检查!');
         let batchS = this.form.arrivalBatch.map((item) => item.batch);
-        if (new Set(batchS).size != this.form.arrivalBatch.length&&this.isBatch) {
+        if (
+          new Set(batchS).size != this.form.arrivalBatch.length &&
+          this.isBatch
+        ) {
           return this.$message.warning('批次号不能重复!');
         }
         this.$refs.tableForm.validate((valid) => {

+ 116 - 0
src/components/timeDialog/indexAll.vue

@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <el-button
+      size="small"
+      type="primary"
+      class="ele-btn-icon"
+      style="margin-left: 5px"
+      @click="open"
+      :disabled="disabled"
+      >批量设置到货方式
+    </el-button>
+    <ele-modal
+      :visible.sync="batchVisible"
+      title="批量选择"
+      width="25vw"
+      append-to-body
+      @close="handleClose"
+      :maxable="true"
+    >
+      <el-form :model="form" label-width="100px">
+        <el-form-item label="到货方式" prop="deliveryMethod">
+          <el-select
+            clearable
+            v-model="form.deliveryMethod"
+            placeholder="请选择"
+          >
+            <el-option label="一次性到货" :value="1" />
+            <el-option label="分批到货" :value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="要求到货时间" prop="requireDeliveryTime">
+          <el-date-picker
+            clearable
+            v-model="form.requireDeliveryTime"
+            type="date"
+            v-show="form.deliveryMethod == 1"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择日期"
+            :pickerOptions="{
+              disabledDate: (time) =>
+                time.getTime() <
+                new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+            }"
+          >
+          </el-date-picker>
+          <el-link
+            type="primary"
+            :underline="false"
+            v-show="form.deliveryMethod == 2"
+            @click.native="handleMethod()"
+          >
+            设置分批时间
+          </el-link>
+        </el-form-item>
+      </el-form>
+      <template v-slot:footer>
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确认</el-button>
+      </template>
+      <timeDialog
+        @chooseTime="chooseTime"
+        ref="timeDialogRef"
+        :isAll="true"
+      ></timeDialog>
+    </ele-modal>
+  </div>
+</template>
+
+<script>
+  import { copyObj } from '@/utils/util';
+  import timeDialog from '@/components/timeDialog/index.vue';
+
+  const def = {
+    deliveryMethod: '',
+    requireDeliveryTime: '',
+    arrivalBatch: []
+  };
+  export default {
+    components: { timeDialog },
+    computed: {},
+    data() {
+      return {
+        batchVisible: false,
+        form: copyObj(def)
+      };
+    },
+    props:{
+      disabled:{
+        type:Boolean,
+        default:true
+      }
+    },
+    methods: {
+      open() {
+        this.batchVisible = true;
+        this.form = copyObj(def);
+      },
+      handleMethod() {
+        this.$refs.timeDialogRef.open({ arrivalBatch:this.form.arrivalBatch});
+      },
+      chooseTime({ arrivalBatch }) {
+        this.form.arrivalBatch = arrivalBatch;
+      },
+      handleConfirm() {
+        console.log(this.form, 'this.form');
+        this.$emit('chooseTime', this.form);
+        this.handleClose();
+      },
+      handleClose() {
+        this.batchVisible = false;
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped></style>

+ 4 - 4
src/views/purchasingManage/producerManage/components/contactDetailDialog.vue

@@ -540,7 +540,7 @@ import dictMixins from '@/mixins/dictMixins';
 import deptSelect from '@/components/CommomSelect/dept-select.vue';
 import personSelect from '@/components/CommomSelect/person-select.vue';
 import {copyObj} from '@/utils/util';
-import {reviewStatus, reviewStatusEnum,lbjtList} from "@/enum/dict";
+import {reviewStatus,lbjtList} from "@/enum/dict";
 import certificateQualificationsDialog
   from "@/views/purchasingManage/supplierManage/components/certificateQualificationsDialog.vue";
 import {getTableList} from '@/api/purchasingManage/purchaseOrder';
@@ -978,7 +978,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {
@@ -1057,7 +1057,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {
@@ -1144,7 +1144,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {

+ 47 - 5
src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue

@@ -9,11 +9,12 @@
       @columns-change="handleColumnChange"
       :cache-key="cacheKeyUrl"
       class="time-form"
+      :selection.sync="selection"
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
         <div class="headbox">
-          <div>
+          <div style="display: flex">
             <el-button
               size="small"
               type="primary"
@@ -32,6 +33,11 @@
             >
               新增临时产品
             </el-button>
+
+            <timeDialogAll
+              @chooseTime="chooseTimeALl"
+              :disabled="!selection.length"
+            ></timeDialogAll>
           </div>
         </div>
       </template>
@@ -368,6 +374,7 @@
   import fileUpload from '@/components/upload/fileUpload';
   import headList from '@/BIZComponents/user-select/user-select.vue';
   import timeDialog from '@/components/timeDialog/index.vue';
+  import timeDialogAll from '@/components/timeDialog/indexAll.vue';
   import { copyObj } from '@/utils/util';
   import { getInventoryTotalAPI } from '@/api/wms';
   // import fileMain from '@/components/addDoc/index.vue';
@@ -377,7 +384,7 @@
   import { levelList } from '@/enum/dict.js';
 
   export default {
-    mixins: [dictMixins,tabMixins],
+    mixins: [dictMixins, tabMixins],
     components: {
       // fileMain,
       productList,
@@ -385,7 +392,8 @@
       fileUpload,
       headList,
       timeDialog,
-      taskinstanceDialog
+      taskinstanceDialog,
+      timeDialogAll
     },
     data() {
       const defaultForm = {
@@ -396,7 +404,7 @@
       };
       return {
         levelList,
-        cacheKeyUrl:'eos-purchaseNeedManage-inventoryTable',
+        cacheKeyUrl: 'eos-purchaseNeedManage-inventoryTable',
         numberReg,
         defaultForm,
         arrivalWayList: [
@@ -406,6 +414,7 @@
         form: {
           datasource: []
         },
+        selection: [],
         rules: {},
         dictList: {},
         taskinstanceDialogFlag: false,
@@ -416,6 +425,14 @@
             columnKey: 'index',
             align: 'center'
           },
+          {
+            label: '选择',
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center',
+            fixed: 'left'
+          },
           {
             width: 120,
             prop: 'productCategoryName',
@@ -619,7 +636,10 @@
       //修改回显
       async putTableValue(data) {
         if (data && data?.length) {
-          this.form.datasource = data;
+          this.form.datasource = data.map((item, index) => {
+            item.key = index + 1;
+            return item;
+          });
           //获取仓库库存
           let codeList = this.form.datasource
             .filter((item) => item.productCode)
@@ -655,6 +675,28 @@
           copyObj(arrivalBatch)
         );
       },
+      chooseTimeALl(data) {
+        console.log(data, 'data');
+        let keyS = this.selection.map((item) => item.key - 1);
+        keyS.forEach((key) => {
+        this.$set(this.form.datasource[key], 'arrivalWay', data.deliveryMethod);
+
+          if (data.deliveryMethod == 1) {
+            this.$set(
+              this.form.datasource[key],
+              'expectReceiveDate',
+              data.requireDeliveryTime
+            );
+          } else {
+            this.$set(
+              this.form.datasource[key],
+              'arrivalBatch',
+              copyObj(data.arrivalBatch)
+            );
+            this.$set(this.form.datasource[key],'totalCount',data.arrivalBatch.map(item=>item.arriveCount).reduce((a,b)=>a+b,0))
+          }
+        });
+      },
       //cbom新增
       handCBom(row, index) {
         this.$refs.cBomRef.open(this.form.datasource, index);

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

@@ -175,7 +175,7 @@
   import addAccountDialog from './components/addAccountDialog.vue';
   import detailDialog from './components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import orderDetailDialog from '@/views/purchasingManage/purchaseOrder/components/detailDialog.vue';
   import addReturnGoodsDialog from '@/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog';
   import {
@@ -314,7 +314,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 7 - 2
src/views/purchasingManage/purchaseOrder/components/detailDialog.vue

@@ -375,6 +375,9 @@
     <div v-if="activeComp == 'invoice'">
       <invoiceList :orderId="detailId"></invoiceList>
     </div>
+    <div v-if="activeComp == 'outSourceSend'">
+      <outSourceSendList :orderId="detailId"></outSourceSendList>
+    </div>
     <div v-if="activeComp == 'returnorder'">
       <returnGoodsList :orderId="detailId"></returnGoodsList>
     </div>
@@ -400,6 +403,7 @@
   import invoiceList from '@/views/purchasingManage/purchaseOrder/orderAssociation/invoiceList.vue';
   import returnGoodsList from '@/views/purchasingManage/purchaseOrder/orderAssociation/returnGoodsList.vue';
   import accountstatementList from '@/views/purchasingManage/purchaseOrder/orderAssociation/accountstatementList.vue';
+  import outSourceSendList from '@/views/purchasingManage/purchaseOrder/orderAssociation/outSourceSendList.vue';
   import { getFile } from '@/api/system/file';
   import dictMixins from '@/mixins/dictMixins';
   import { copyObj } from '@/utils/util';
@@ -414,7 +418,7 @@
     mixins: [dictMixins, tabMixins],
     components: {
       billDetailDialog,
-      // fileMain,
+      outSourceSendList,
       invoiceList,
       returnGoodsList,
       accountstatementList,
@@ -447,6 +451,7 @@
         tabOptions: [
           { key: 'order', name: '订单详情' },
           { key: 'bpm', name: '流程详情' },
+          { key: 'outSourceSend', name: '发货列表' },
           { key: 'invoice', name: '收货列表' },
           { key: 'returnorder', name: '退货列表' },
           { key: 'accountstatement', name: '对账列表' }
@@ -462,7 +467,7 @@
         rules: {},
         detailData: {},
 
-       columns: [
+        columns: [
           {
             width: 45,
             type: 'index',

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

@@ -170,7 +170,7 @@
   import detailDialog from './components/detailDialog.vue';
   import printTemplateWl from './components/print-template-wl.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import orderDetailDialog from '@/views/purchasingManage/purchaseOrder/components/detailDialog.vue';
 
   import addReturnGoodsDialog from '@/views/purchasingManage/purchaseOrder/returnGoods/components/addReturnGoodsDialog';
@@ -307,7 +307,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 2 - 2
src/views/purchasingManage/purchaseOrder/orderAssociation/accountstatementList.vue

@@ -43,7 +43,7 @@
 
 <script>
   import detailDialog from '@/views/purchasingManage/purchaseOrder/accountstatement/components/detailDialog.vue';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import { getAccountstatementList } from '@/api/saleManage/accountstatement';
   import dictMixins from '@/mixins/dictMixins';
 
@@ -136,7 +136,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
 

+ 2 - 2
src/views/purchasingManage/purchaseOrder/orderAssociation/invoiceList.vue

@@ -34,7 +34,7 @@
 
 <script>
   import detailDialog from '@/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import { getReceiveTableList } from '@/api/purchasingManage/purchaseorderreceive';
   import dictMixins from '@/mixins/dictMixins';
 
@@ -110,7 +110,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 200 - 0
src/views/purchasingManage/purchaseOrder/orderAssociation/outSourceSendList.vue

@@ -0,0 +1,200 @@
+<template>
+  <div class="ele-body">
+    <el-card shadow="never" v-loading="loading">
+      <div class="ele-border-lighter form-content" v-loading="loading">
+        <!-- 数据表格 -->
+        <ele-pro-table
+          ref="table"
+          :columns="columns"
+          :datasource="datasource"
+          height="calc(100vh - 385px)"
+          full-height="calc(100vh - 116px)"
+          tool-class="ele-toolbar-form"
+        >
+          <!-- 查看详情列 -->
+
+          <template v-slot:code="{ row }">
+            <el-link
+              type="primary"
+              :underline="false"
+              @click="openorderDetail(row)"
+            >
+              {{ row.code }}</el-link
+            >
+          </template>
+        </ele-pro-table>
+      </div>
+    </el-card>
+
+    <detail-dialog
+      ref="detailDialogRef"
+      :detailDialogFlag.sync="detailDialogFlag"
+      v-if="detailDialogFlag"
+    ></detail-dialog>
+  </div>
+</template>
+
+<script>
+  import detailDialog from '@/views/purchasingManage/purchaseOrder/outSourceSend/components/detailDialog.vue';
+  import { reviewStatus } from '@/enum/dict';
+  import { getPurchaseOutSourceSendPageAPI } from '@/api/purchasingManage/outSourceSend';
+  import dictMixins from '@/mixins/dictMixins';
+
+  export default {
+    mixins: [dictMixins],
+    props: {
+      orderId: String
+    },
+    components: {
+      detailDialog
+    },
+    data() {
+      return {
+        detailDialogFlag: false,
+        loading: false, // 加载状态
+        columns: [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'code',
+            label: '发货单编码',
+            align: 'center',
+            slot: 'code',
+            sortable: true,
+            showOverflowTooltip: true,
+            minWidth: 200
+          },
+          {
+            prop: 'productNames',
+            label: '产品名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 140
+          },
+          {
+            prop: 'productCodes',
+            label: '产品编码',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 160
+          },
+          {
+            prop: 'batchNos',
+            label: '批次号',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 140
+          },
+          {
+            prop: 'productCount',
+            label: '数量',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 140
+          },
+
+          {
+            prop: 'supplierName',
+            label: '外协单位',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 180
+          },
+          {
+            prop: 'reviewStatus',
+            label: '状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 120,
+            formatter: (_row, _column, cellValue) => {
+              return reviewStatus[_row.reviewStatus];
+            }
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 170
+          }
+        ]
+      };
+    },
+    computed: {},
+
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return getPurchaseOutSourceSendPageAPI({
+          pageNum: page,
+          size: limit,
+          orderId: this.orderId,
+          ...where
+        });
+      },
+
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      },
+
+      //查看详情
+      openorderDetail(row, type) {
+        this.detailDialogFlag = true;
+        this.$nextTick(() => {
+          this.$refs.detailDialogRef.open(row);
+        });
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .ele-body {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+  :deep .el-card__body {
+    padding: 0;
+  }
+  :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;
+    }
+  }
+
+  .switch_left ul .active {
+    border-top: 4px solid var(--color-primary);
+    color: var(--color-primary-5);
+  }
+  .switch {
+    padding-bottom: 20px;
+  }
+
+  .el-dropdown-link {
+    cursor: pointer;
+    color: var(--color-primary-5);
+  }
+  .el-icon-arrow-down {
+    font-size: 12px;
+  }
+</style>

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

@@ -157,7 +157,7 @@
   import searchTable from './components/searchTable.vue';
   import addOrEditDialog from './components/addOrEditDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus} from '@/enum/dict';
 
   import detailDialog from './components/detailDialog.vue';
 
@@ -274,7 +274,7 @@
             showOverflowTooltip: true,
             minWidth: 120,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

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

@@ -148,7 +148,7 @@
   import sendDetailDialog from '@/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue';
   import orderDetailDialog from '@/views/purchasingManage/purchaseOrder/components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
 
   import {
     getReturnTableList,
@@ -284,7 +284,7 @@
             showOverflowTooltip: true,
             minWidth: 100,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 4 - 4
src/views/purchasingManage/supplierManage/components/contactDetailDialog.vue

@@ -582,7 +582,7 @@
   import deptSelect from '@/components/CommomSelect/dept-select.vue';
   import personSelect from '@/components/CommomSelect/person-select.vue';
   import { copyObj } from '@/utils/util';
-  import { reviewStatus, reviewStatusEnum, lbjtList } from '@/enum/dict';
+  import { reviewStatus, lbjtList } from '@/enum/dict';
   // import certificateQualificationsDialog
   //   from "@/views/purchasingManage/supplierManage/components/certificateQualificationsDialog.vue";
   import { getTableList } from '@/api/purchasingManage/purchaseOrder';
@@ -1024,7 +1024,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {
@@ -1105,7 +1105,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {
@@ -1192,7 +1192,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 4 - 2
src/views/saleManage/businessOpportunity/components/addFollowDialog.vue

@@ -1,13 +1,15 @@
 <template>
   <div class="container">
     <!-- 单据弹窗 -->
-    <el-dialog
+    <ele-modal
       :title="title"
       :before-close="handleClose"
       custom-class="ele-dialog-form long-dialog-form"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       :append-to-body="true"
+      :maxable="true"
+    :resizable="true"
       width="60%"
     >
       <el-form
@@ -90,7 +92,7 @@
         <el-button size="small" @click="handleClose">关 闭</el-button>
         <el-button size="small" @click="sumbit" type="primary" v-click-once>确 认</el-button>
       </div>
-    </el-dialog>
+    </ele-modal>
   </div>
 </template>
 <script>

+ 4 - 2
src/views/saleManage/businessOpportunity/components/followDetailDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <ele-model
     custom-class="ele-dialog-form"
     v-if="visible"
     :visible.sync="visible"
@@ -8,6 +8,8 @@
     :append-to-body="true"
     width="70%"
     @close="cancel"
+    :maxable="true"
+    :resizable="true"
   >
       <el-form
           label-width="160px"
@@ -57,7 +59,7 @@
     <div slot="footer" class="footer">
       <el-button @click="cancel">返回</el-button>
     </div>
-  </el-dialog>
+  </ele-model>
 </template>
 
 <script>

+ 4 - 5
src/views/saleManage/businessOpportunity/components/followList.vue

@@ -1,15 +1,14 @@
 <template>
-  <el-dialog
+  <ele-modal
     title="跟进列表"
     :visible.sync="visible"
     :before-close="handleClose"
-    :multiple="true"
-    :centered="false"
     :close-on-click-modal="false"
-    top="2vh"
     :close-on-press-escape="false"
     append-to-body
     width="70%"
+    :maxable="true"
+    :resizable="true"
   >
     <el-card shadow="never">
       <ele-pro-table
@@ -96,7 +95,7 @@
       content="是否确定删除?"
       @done="commitBtn"
     />
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>

+ 1 - 1
src/views/saleManage/contact/components/certificateManagement/components/add-dialog.vue

@@ -126,7 +126,7 @@
   import { getCode } from '@/api/login/index.js';
   import productTable from './productTable.vue';
 
-  import { listOrganizations } from '@/api/system/organization';
+  // import { listOrganizations } from '@/api/system/organization';
   import { holderTypeOptions } from '@/enum/dict.js';
   const defaultForm = {
     code: '',

+ 4 - 4
src/views/saleManage/contact/components/contactDetailDialog.vue

@@ -727,7 +727,7 @@ import personSelect from '@/components/CommomSelect/person-select.vue';
 import {copyObj} from '@/utils/util';
 import certificateQualificationsDialog
   from "@/views/purchasingManage/supplierManage/components/certificateQualificationsDialog.vue";
-import {reviewStatus, reviewStatusEnum} from "@/enum/dict";
+import {reviewStatus} from "@/enum/dict";
 import searchTable from "@/views/saleManage/saleOrder/components/searchTable.vue";
 import {getTableList} from "@/api/saleManage/saleorder";
 import {getSendTableList} from "@/api/saleManage/saleordersendrecord";
@@ -1187,7 +1187,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {
@@ -1266,7 +1266,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {
@@ -1352,7 +1352,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {

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

@@ -182,7 +182,7 @@
   import addAccountDialog from './components/addAccountDialog.vue';
 
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
   import addReturnGoodsDialog from '@/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog';
   import detailDialog from './components/detailDialog.vue';
@@ -335,7 +335,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

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

@@ -149,7 +149,7 @@ import sendDetailDialog from '@/views/saleManage/saleOrder/invoice/components/de
 import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
 import popModal from '@/components/pop-modal';
 import addOrEditDialog from "@/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue";
-import {reviewStatusEnum} from '@/enum/dict';
+import {reviewStatus} from '@/enum/dict';
 import searchTablePage from "@/views/saleManage/saleOrder/customerReturnOrder/searchTable-page.vue";
 import detailDialog from "../returnGoods/components/detailDialog.vue";
 import addSaleOrderDialog from "@/views/saleManage/saleOrder/customerReturnOrder/add-sale-order-dialog.vue";
@@ -297,7 +297,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 100,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.approvalStatus].label;
+            return reviewStatus[_row.approvalStatus];
           }
         },
         {

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

@@ -26,7 +26,7 @@
 
 import searchTable from './searchTable.vue';
 import {getReturnTableList} from '@/api/saleManage/returnGoods';
-import {reviewStatusEnum} from '@/enum/dict';
+import {reviewStatus} from '@/enum/dict';
 
 export default {
   components: {
@@ -94,7 +94,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {

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

@@ -157,7 +157,7 @@
   import searchTable from './components/searchTable.vue';
   import addOrEditDialog from './components/addOrEditDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import detailDialog from './components/detailDialog.vue';
   import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
   import dictMixins from '@/mixins/dictMixins';
@@ -271,7 +271,7 @@
             showOverflowTooltip: true,
             minWidth: 120,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

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

@@ -216,7 +216,7 @@
   import addInvoiceConfirm from '@/views/saleManage/saleOrder/invoiceConfirm/components/addInvoiceDialog.vue';
   import detailDialog from './components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
   import addReturnGoodsDialog from '@/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog';
   import printTemplateBy from '@/views/saleManage/saleOrder/invoice/components/print-template-by.vue';
@@ -379,7 +379,7 @@
             showOverflowTooltip: true,
             minWidth: 100,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 2 - 2
src/views/saleManage/saleOrder/invoiceConfirm/components/sendListDialog.vue

@@ -41,7 +41,7 @@
 import { contactTypeTree } from '@/api/saleManage/contact';
 import searchTable from '@/views/saleManage/saleOrder/invoice/components/searchTable.vue';
 import { getSendTableList } from '@/api/saleManage/saleordersendrecord';
-import { reviewStatusEnum } from '@/enum/dict';
+import { reviewStatus } from '@/enum/dict';
 
 export default {
   components: {
@@ -122,7 +122,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {

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

@@ -159,7 +159,7 @@
   import addInvoiceDialog from './components/addInvoiceDialog.vue';
   import detailDialog from './components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
 
   import invoiceDetailDialog from '@/views/saleManage/saleOrder/invoice/components/detailDialog.vue';
   import addReturnGoodsDialog from '@/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog';
@@ -310,7 +310,7 @@
             showOverflowTooltip: true,
             minWidth: 100,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 2 - 2
src/views/saleManage/saleOrder/orderAssociation/accountstatementList.vue

@@ -34,7 +34,7 @@
   
   <script>
   import detailDialog from '@/views/saleManage/saleOrder/accountstatement/components/detailDialog.vue';
-  import {reviewStatusEnum} from '@/enum/dict';
+  import {reviewStatus} from '@/enum/dict';
   import {getAccountstatementList} from '@/api/saleManage/accountstatement';
   import dictMixins from '@/mixins/dictMixins';
   
@@ -133,7 +133,7 @@
               showOverflowTooltip: true,
               minWidth: 200,
               formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
             },
            

+ 2 - 2
src/views/saleManage/saleOrder/orderAssociation/invoiceList.vue

@@ -32,7 +32,7 @@
   
   <script>
   import detailDialog from '@/views/saleManage/saleOrder/invoice/components/detailDialog.vue';
-  import {reviewStatusEnum} from '@/enum/dict';
+  import {reviewStatus} from '@/enum/dict';
   import addReturnGoodsDialog from '@/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog';
   import {getSendTableList} from '@/api/saleManage/saleordersendrecord';
   import dictMixins from '@/mixins/dictMixins';
@@ -106,7 +106,7 @@
               showOverflowTooltip: true,
               minWidth: 200,
               formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
             },
             {

+ 2 - 2
src/views/saleManage/saleOrder/orderAssociation/returnGoodsList.vue

@@ -38,7 +38,7 @@
   <script>
   import detailDialog from '@/views/saleManage/saleOrder/returnGoods/components/detailDialog.vue';
   import sendDetailDialog from '@/views/saleManage/saleOrder/invoice/components/detailDialog.vue'
-  import {reviewStatusEnum} from '@/enum/dict';
+  import {reviewStatus} from '@/enum/dict';
   import {getReturnTableList} from '@/api/saleManage/returnGoods';
   import dictMixins from '@/mixins/dictMixins';
   
@@ -117,7 +117,7 @@
               showOverflowTooltip: true,
               minWidth: 200,
               formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
             },
             {

+ 2 - 2
src/views/saleManage/saleOrder/returnGoods/components/sendListDialog.vue

@@ -41,7 +41,7 @@
 import { contactTypeTree } from '@/api/saleManage/contact';
 import searchTable from '@/views/saleManage/saleOrder/invoice/components/searchTable.vue';
 import { getSendTableList } from '@/api/saleManage/saleordersendrecord';
-import { reviewStatusEnum } from '@/enum/dict';
+import { reviewStatus } from '@/enum/dict';
 
 export default {
   components: {
@@ -122,7 +122,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {

+ 3 - 3
src/views/saleManage/saleOrder/returnGoods/components/sendListMultipleDialog.vue

@@ -90,7 +90,7 @@
   import { contactTypeTree } from '@/api/saleManage/contact';
   import searchTable from '@/views/saleManage/saleOrder/invoice/components/searchTable.vue';
   import { getSendTableList } from '@/api/saleManage/saleordersendrecord';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import { getSendConfirmTableList } from '@/api/saleManage/invoiceConfirm';
 
   export default {
@@ -200,7 +200,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {
@@ -299,7 +299,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

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

@@ -196,7 +196,7 @@
   import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
   import customerReturnOrderDialog from '@/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import {
     getReturnTableList,
     submit,
@@ -357,7 +357,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 2 - 2
src/views/salesServiceManagement/components/invoiceDialog.vue

@@ -121,7 +121,7 @@
     getSendTableList,
     getSendSaleOrderrecordDetailSplit
   } from '@/api/saleManage/saleordersendrecord';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
   import { lbjtList } from '@/enum/dict.js';
   import { getInfoBySourceBizNoAll } from '@/api/wms';
   const dayjs = require('dayjs');
@@ -195,7 +195,7 @@
             showOverflowTooltip: true,
             minWidth: 120,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 2 - 2
src/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue

@@ -26,7 +26,7 @@
 
 import searchTable from './purchaseReturnSearchTable.vue';
 import {getReturnTableList} from '@/api/purchasingManage/returnGoods';
-import {reviewStatusEnum} from '@/enum/dict';
+import {reviewStatus} from '@/enum/dict';
 
 export default {
   components: {
@@ -83,7 +83,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
-            return reviewStatusEnum[_row.reviewStatus].label;
+            return reviewStatus[_row.reviewStatus];
           }
         },
         {

+ 2 - 2
src/views/transportManager/shipManage/taskWorkManage/components/sendListDialog.vue

@@ -37,7 +37,7 @@
   import { contactTypeTree } from '@/api/saleManage/contact';
   import searchTable from '@/views/saleManage/saleOrder/invoice/components/searchTable.vue';
   import { getSendTableList } from '@/api/saleManage/saleordersendrecord';
-  import { reviewStatusEnum } from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
 
   export default {
     components: {
@@ -121,7 +121,7 @@
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
-              return reviewStatusEnum[_row.reviewStatus].label;
+              return reviewStatus[_row.reviewStatus];
             }
           },
           {

+ 1 - 1
vue.config.js

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