quwangxin 2 lat temu
rodzic
commit
84bf5404ba

+ 4 - 2
src/store/index.js

@@ -9,7 +9,7 @@ import user from './modules/user';
 import selectCache from './modules/selectCache';
 import theme from './modules/theme';
 import createPersistedState from 'vuex-persistedstate';
-import { createMutationObserve } from './store.js';
+import { createMutationObserve } from './plugins.js';
 
 import { SYSTEM_NAME } from '@/config/setting';
 
@@ -27,6 +27,7 @@ export default new Vuex.Store({
   },
   getters,
   plugins: [
+    //会自动保存创建的状态。刷新还在
     createPersistedState({
       key: window.__POWERED_BY_QIANKUN__
         ? `vuex-${SYSTEM_NAME}`
@@ -34,6 +35,7 @@ export default new Vuex.Store({
       storage: window.sessionStorage,
       paths: ['user']
     }),
+    // 更新主应用 vuex
     createMutationObserve({ modules: ['theme', 'user'] })
-  ] //会自动保存创建的状态。刷新还在
+  ]
 });

+ 2 - 1
src/store/store.js → src/store/plugins.js

@@ -29,7 +29,8 @@ export const createMutationObserve = ({ modules = [] }) => {
         modules?.length &&
         modules.find((i) => mutation?.type?.startsWith(i + '/'))
       ) {
-        vue.$portalStore?.commit(mutation.type, mutation.payload);
+        vue.$portalStore?.commit &&
+          vue.$portalStore?.commit(mutation.type, mutation.payload);
       }
     });
   };

+ 304 - 267
src/views/saleOrder/components/order-detail.vue

@@ -6,218 +6,247 @@
     append-to-body
   >
     <div class="main_container">
-		<div class="basic-details-title border-none">
-		  <span class="border-span">基本信息</span>
-		</div>
-		<el-descriptions title="" :column="6" size="medium" border>
-		  <el-descriptions-item>
-			<template slot="label"> 销售订单号 </template>
-			{{form.salesOrderBasicInfo.code}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 下达时间 </template>
-			{{form.salesOrderBasicInfo.releaseTime}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 合同数量</template>
-			{{form.salesOrderBasicInfo.contractNum}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 已交货数量 </template>
-			{{form.salesOrderBasicInfo.deliveredQuantity}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 欠交货数量 </template>
-			{{form.salesOrderBasicInfo.lackNum}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 订单来源 </template>
-			{{getDictValue('订单来源', form.salesOrderBasicInfo.orderSource)}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 订单类型 </template>
-			{{getDictValue('订单类型', form.salesOrderBasicInfo.orderType)}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 交付时间 </template>
-			{{form.salesOrderBasicInfo.deliveryTime}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 合同重量 </template>
-			{{form.salesOrderBasicInfo.sumOrderWeight}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 已交货重量 </template>
-			{{form.salesOrderBasicInfo.deliveredWeight}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 欠交货重量 </template>
-			{{form.salesOrderBasicInfo.backOrderWeight}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 交付要求 </template>
-			{{getDictValue('交付要求', form.salesOrderBasicInfo.deliveryRequirements)}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 按单按库 </template>
-			{{getDictValue('按单按库', form.salesOrderBasicInfo.orderLibraryType)}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 交货工厂 </template>
-			{{form.salesOrderBasicInfo.deliveryPlant}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 计划单号 </template>
-			{{form.salesOrderBasicInfo.productionPlanCode}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 交货状态 </template>
-			{{getDictValue('交货状态', form.salesOrderBasicInfo.deliveryStatus)}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 更新时间 </template>
-			{{form.salesOrderBasicInfo.updateTime}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 创建人 </template>
-			{{form.salesOrderBasicInfo.createUserName}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 生产状态 </template>
-			{{getDictValue('生产状态', form.salesOrderBasicInfo.status)}}
-		  </el-descriptions-item>
-		</el-descriptions>
-		<div class="basic-details-title border-none">
-		  <span class="border-span">产品规格需求</span>
-		</div>
-		<el-descriptions title="" :column="6" size="medium" border>
-		  <el-descriptions-item>
-			<template slot="label"> 行号 </template>
-			{{form.productSpecRequirement.lineNumber}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 产品编码 </template>
-			{{form.productSpecRequirement.productCode}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 牌号 </template>
-			{{form.productSpecRequirement.brandNo}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 型号 </template>
-			{{form.productSpecRequirement.model}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 单重 </template>
-			{{form.productSpecRequirement.productUnitWeight}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 重量单位 </template>
-			{{form.productSpecRequirement.unitWeight}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 单位 </template>
-			{{form.productSpecRequirement.unitQuantity}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 产品层次4 </template>
-			{{form.productSpecRequirement.categoryPathNameField4}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 产品层次5 </template>
-			{{form.productSpecRequirement.categoryPathNameField5}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 包装要求 </template>
-			{{form.productSpecRequirement.packageRequirements}}
-		  </el-descriptions-item>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label"> 物料描述 </template>
-			{{form.productSpecRequirement.description}}
-		  </el-descriptions-item>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label"> 技术要求 </template>
-			{{form.productSpecRequirement.technicalRequirement}}
-		  </el-descriptions-item>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label"> 印字要求 </template>
-			{{form.productSpecRequirement.printingRequirement}}
-		  </el-descriptions-item>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label"> 质量证书要求 </template>
-			{{form.productSpecRequirement.qualityCertificateRequirements}}
-		  </el-descriptions-item>
-		</el-descriptions>
-		<div class="basic-details-title border-none">
-		  <span class="border-span">业务信息</span>
-		</div>
-		<el-descriptions title="" :column="6" size="medium" border>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label"> 客户名称 </template>
-			{{form.businessInfo.customerName}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 客户代码 </template>
-			{{form.businessInfo.customerCode}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 客户参考 </template>
-			{{form.businessInfo.customerReference}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 业务员 </template>	
-			{{form.businessInfo.salesman}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label"> 销售业务员 </template>
-			{{form.businessInfo.salesRepresentative}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-			<template slot="label" > 销售组织 </template>
-			{{form.businessInfo.salesOrganization}}
-		  </el-descriptions-item>
-		  <el-descriptions-item>
-		  	<template slot="label"> 销售组 </template>
-			{{form.businessInfo.salesGroup}}
-		  </el-descriptions-item>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label"> 销售要求 </template>	
-			{{form.businessInfo.salesRequirement}}
-		  </el-descriptions-item>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label"> 销售组织描述 </template>
-			{{form.businessInfo.salesOrganizationDescription}}
-		  </el-descriptions-item>
-		  <el-descriptions-item :span='2'>
-		  	<template slot="label" > 销售组名称 </template>
-			{{form.businessInfo.salesGroupName}}
-		  </el-descriptions-item>
-		</el-descriptions>
-		<div class="basic-details-title border-none">
-		  <span class="border-span">当前订单所有产品</span>
-		</div>
-		<el-table
-		  :data="form.salesOrderAllProductsList"
-		  style="width: 100%"
-		  border
-		>
-			  <el-table-column label="行号" align="center" prop="lineNumber">
-			  </el-table-column>
-			  <el-table-column label="产品编码" align="center" prop="productCode" width="160" >
-			  </el-table-column>
-			  <el-table-column label="牌号" align="center" prop="brandNo">
-			  </el-table-column>
-			  <el-table-column label="型号" align="center" prop="model" width="160">
-			  </el-table-column>
-			  <el-table-column label="合同数量" align="center" prop="contractNum">
-			  </el-table-column>
-			  <el-table-column label="计划单号" align="center" prop="productionPlanCode" width="160">
-			  </el-table-column>
-			  <el-table-column label="计划生产数量" align="center" width="120" prop="planProductNum">
-			  </el-table-column>
-			  <el-table-column label="要求成型数量" align="center" width="120" prop="reqProductNum">
-			  </el-table-column>
-			  <!-- <el-table-column label="未成型数量" align="center" width="120" prop="unfinishedQuantity">
+      <div class="basic-details-title border-none">
+        <span class="border-span">基本信息</span>
+      </div>
+      <el-descriptions title="" :column="6" size="medium" border>
+        <el-descriptions-item>
+          <template slot="label"> 销售订单号 </template>
+          {{ form.salesOrderBasicInfo.code }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 下达时间 </template>
+          {{ form.salesOrderBasicInfo.releaseTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 合同数量</template>
+          {{ form.salesOrderBasicInfo.contractNum }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 已交货数量 </template>
+          {{ form.salesOrderBasicInfo.deliveredQuantity }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 欠交货数量 </template>
+          {{ form.salesOrderBasicInfo.lackNum }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 订单来源 </template>
+          {{ getDictValue('订单来源', form.salesOrderBasicInfo.orderSource) }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 订单类型 </template>
+          {{ getDictValue('订单类型', form.salesOrderBasicInfo.orderType) }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 交付时间 </template>
+          {{ form.salesOrderBasicInfo.deliveryTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 合同重量 </template>
+          {{ form.salesOrderBasicInfo.sumOrderWeight }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 已交货重量 </template>
+          {{ form.salesOrderBasicInfo.deliveredWeight }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 欠交货重量 </template>
+          {{ form.salesOrderBasicInfo.backOrderWeight }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 交付要求 </template>
+          {{
+            getDictValue(
+              '交付要求',
+              form.salesOrderBasicInfo.deliveryRequirements
+            )
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 按单按库 </template>
+          {{
+            getDictValue('按单按库', form.salesOrderBasicInfo.orderLibraryType)
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 交货工厂 </template>
+          {{ form.salesOrderBasicInfo.deliveryPlant }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 计划单号 </template>
+          {{ form.salesOrderBasicInfo.productionPlanCode }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 交货状态 </template>
+          {{
+            getDictValue('交货状态', form.salesOrderBasicInfo.deliveryStatus)
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 更新时间 </template>
+          {{ form.salesOrderBasicInfo.updateTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 创建人 </template>
+          {{ form.salesOrderBasicInfo.createUserName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 生产状态 </template>
+          {{ getDictValue('生产状态', form.salesOrderBasicInfo.status) }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <div class="basic-details-title border-none">
+        <span class="border-span">产品规格需求</span>
+      </div>
+      <el-descriptions title="" :column="6" size="medium" border>
+        <el-descriptions-item>
+          <template slot="label"> 行号 </template>
+          {{ form.productSpecRequirement.lineNumber }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 产品编码 </template>
+          {{ form.productSpecRequirement.productCode }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 牌号 </template>
+          {{ form.productSpecRequirement.brandNo }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 型号 </template>
+          {{ form.productSpecRequirement.model }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 单重 </template>
+          {{ form.productSpecRequirement.productUnitWeight }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 重量单位 </template>
+          {{ form.productSpecRequirement.unitWeight }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 单位 </template>
+          {{ form.productSpecRequirement.unitQuantity }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 产品层次4 </template>
+          {{ form.productSpecRequirement.categoryPathNameField4 }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 产品层次5 </template>
+          {{ form.productSpecRequirement.categoryPathNameField5 }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 包装要求 </template>
+          {{ form.productSpecRequirement.packageRequirements }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 物料描述 </template>
+          {{ form.productSpecRequirement.description }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 技术要求 </template>
+          {{ form.productSpecRequirement.technicalRequirement }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 印字要求 </template>
+          {{ form.productSpecRequirement.printingRequirement }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 质量证书要求 </template>
+          {{ form.productSpecRequirement.qualityCertificateRequirements }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <div class="basic-details-title border-none">
+        <span class="border-span">业务信息</span>
+      </div>
+      <el-descriptions title="" :column="6" size="medium" border>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 客户名称 </template>
+          {{ form.businessInfo.customerName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 客户代码 </template>
+          {{ form.businessInfo.customerCode }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 客户参考 </template>
+          {{ form.businessInfo.customerReference }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 业务员 </template>
+          {{ form.businessInfo.salesman }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 销售业务员 </template>
+          {{ form.businessInfo.salesRepresentative }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 销售组织 </template>
+          {{ form.businessInfo.salesOrganization }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 销售组 </template>
+          {{ form.businessInfo.salesGroup }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 销售要求 </template>
+          {{ form.businessInfo.salesRequirement }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 销售组织描述 </template>
+          {{ form.businessInfo.salesOrganizationDescription }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label"> 销售组名称 </template>
+          {{ form.businessInfo.salesGroupName }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <div class="basic-details-title border-none">
+        <span class="border-span">当前订单所有产品</span>
+      </div>
+      <el-table
+        :data="form.salesOrderAllProductsList"
+        style="width: 100%"
+        border
+      >
+        <el-table-column label="行号" align="center" prop="lineNumber">
+        </el-table-column>
+        <el-table-column
+          label="产品编码"
+          align="center"
+          prop="productCode"
+          width="160"
+        >
+        </el-table-column>
+        <el-table-column label="牌号" align="center" prop="brandNo">
+        </el-table-column>
+        <el-table-column label="型号" align="center" prop="model" width="160">
+        </el-table-column>
+        <el-table-column label="合同数量" align="center" prop="contractNum">
+        </el-table-column>
+        <el-table-column
+          label="计划单号"
+          align="center"
+          prop="productionPlanCode"
+          width="160"
+        >
+        </el-table-column>
+        <el-table-column
+          label="计划生产数量"
+          align="center"
+          width="120"
+          prop="planProductNum"
+        >
+        </el-table-column>
+        <el-table-column
+          label="要求成型数量"
+          align="center"
+          width="120"
+          prop="requiredFormingNum"
+        >
+        </el-table-column>
+        <!-- <el-table-column label="未成型数量" align="center" width="120" prop="unfinishedQuantity">
 			  </el-table-column>
 			  <el-table-column label="已成型数量" align="center" width="120" prop="finishedQuantity">
 			  </el-table-column>
@@ -225,17 +254,27 @@
 			  </el-table-column>
 			  <el-table-column label="已出库数量" align="center" width="120" prop="shippedQuantity">
 			  </el-table-column> -->
-			  <el-table-column label="下达日期" align="center" prop="createTime" width="160">
-			  </el-table-column>
-			  <el-table-column label="交付日期" align="center" prop="deliveryTime" width="160">
-			  </el-table-column>
-			  <el-table-column label="状态" align="center" prop="status">
-				  <template slot-scope="{row}">
-					  {{getDictValue('生产状态', row.status)}}
-				  </template>
-			  </el-table-column>
-		</el-table>
-	</div>
+        <el-table-column
+          label="下达日期"
+          align="center"
+          prop="releaseTime"
+          width="160"
+        >
+        </el-table-column>
+        <el-table-column
+          label="交付日期"
+          align="center"
+          prop="deliveryTime"
+          width="160"
+        >
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="{ row }">
+            {{ getDictValue('生产状态', row.status) }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
     <div slot="footer" class="footer">
       <div>
         <el-button @click="cancel">关闭</el-button>
@@ -245,61 +284,59 @@
 </template>
 
 <script>
-	import dictMixins from '@/mixins/dictMixins';
-	import { getSalesDetail  } from '@/api/saleOrder';
-	export default {
-		mixins: [dictMixins],
-    data() {
+  import dictMixins from '@/mixins/dictMixins';
+  import { getSalesDetail } from '@/api/saleOrder';
+  export default {
+    mixins: [dictMixins],
+    data () {
       return {
         visible: false,
-		form:{
-			businessInfo:{},
-			productSpecRequirement:{},
-			salesOrderAllProductsList:[],
-			salesOrderBasicInfo:{}
-		}
+        form: {
+          businessInfo: {},
+          productSpecRequirement: {},
+          salesOrderAllProductsList: [],
+          salesOrderBasicInfo: {}
+        }
       };
     },
-    computed: {
-      
-    },
+    computed: {},
     created () {
-		this.requestDict('按单按库');
-		this.requestDict('交付要求');
-		this.requestDict('订单类型');
-		this.requestDict('订单来源');
-		this.requestDict('生产状态');
-		this.requestDict('交货状态');
+      this.requestDict('按单按库');
+      this.requestDict('交付要求');
+      this.requestDict('订单类型');
+      this.requestDict('订单来源');
+      this.requestDict('生产状态');
+      this.requestDict('交货状态');
     },
     methods: {
-	  open (row) {
-		this.getDetail(row.id)
-		this.visible = true;
-	  },
-	  getDetail(id){
-		  getSalesDetail(id).then(res=>{
-			 if(typeof res.salesOrderBasicInfo != 'string'){
-				 this.form.salesOrderBasicInfo = res.salesOrderBasicInfo
-			 }
-			 if(typeof res.businessInfo != 'string'){
-			 	this.form.businessInfo = res.businessInfo
-			 }
-			 if(typeof res.productSpecRequirement != 'string'){
-			 	this.form.productSpecRequirement = res.productSpecRequirement
-			 }
-			 if(typeof res.salesOrderAllProductsList != 'string'){
-			 	this.form.salesOrderAllProductsList = res.salesOrderAllProductsList
-			 }
-		  })
-	  },
+      open (row) {
+        this.getDetail(row.id);
+        this.visible = true;
+      },
+      getDetail (id) {
+        getSalesDetail(id).then((res) => {
+          if (typeof res.salesOrderBasicInfo != 'string') {
+            this.form.salesOrderBasicInfo = res.salesOrderBasicInfo;
+          }
+          if (typeof res.businessInfo != 'string') {
+            this.form.businessInfo = res.businessInfo;
+          }
+          if (typeof res.productSpecRequirement != 'string') {
+            this.form.productSpecRequirement = res.productSpecRequirement;
+          }
+          if (typeof res.salesOrderAllProductsList != 'string') {
+            this.form.salesOrderAllProductsList = res.salesOrderAllProductsList;
+          }
+        });
+      },
       cancel () {
         this.visible = false;
-      },
+      }
     }
   };
 </script>
 <style lang="scss" scoped>
-  .basic-details-title{
-	  margin:10px 0
+  .basic-details-title {
+    margin: 10px 0;
   }
-</style>
+</style>

+ 2 - 2
vue.config.js

@@ -31,11 +31,11 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.38:8080', // 陈潇
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
-        target: 'http://192.168.3.33:8080', // 谢一平
+        // target: 'http://192.168.3.33:8080', // 谢一平
         // target: 'http://192.168.3.51:18086', // 测试环境
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域