状态

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>

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');

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));
+}

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];
           }
         },
         {

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];
             }
           },
           {

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];
             }
           },
           {

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];
             }
           },
 

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];
             }
           },
           {

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];
             }
           },
           {

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];
             }
           },
           {

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];
             }
           },
           {

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>

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>

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>

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: '',

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];
           }
         },
         {

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];
             }
           },
           {

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];
           }
         },
         {

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];
           }
         },
         {

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];
             }
           },
           {

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];
             }
           },
           {

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];
           }
         },
         {

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];
             }
           },
           {

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];
             }
             },
            

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];
             }
             },
             {

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];
             }
             },
             {

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];
           }
         },
         {

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];
             }
           },
           {

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];
             }
           },
           {

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];
             }
           },
           {

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];
           }
         },
         {

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];
             }
           },
           {

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',