Merge remote-tracking branch 'origin/master' into aa

zkqy-ui/.env.development

@@ -8,7 +8,7 @@ ENV = 'development'
 VUE_APP_BASE_API = '/dev-api'
 
 # 图片路径
-VUE_APP_BASE_IMG_API = 'http://192.168.110.15:1025/dev-api'
+VUE_APP_BASE_IMG_API = 'http://192.168.0.17:1024/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -17,10 +17,10 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # VUE_APP_BASE_API1 = 'http://192.168.110.15:8066/'
 # VUE_APP_BASE_API1 = 'http://192.168.110.120:8066/'
 # VUE_APP_BASE_API1 = 'http://192.168.110.76:8066/'
-VUE_APP_BASE_API1 = 'http://192.168.110.129:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.0.17:8066/'
 
 # ws地址
-VUE_APP_BASE_WS_API = '//localhost:8721'
+VUE_APP_BASE_WS_API = '//127.0.0.1:8721'
 
 #数据引擎模块IP
 #VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'

zkqy-ui/.env.production

@@ -16,7 +16,7 @@ VUE_APP_BASE_API1 = 'http://192.168.0.17:8066/'
 VUE_APP_BASE_IMG_API = 'http://192.168.0.17:1024/dev-api'
 
 # ws地址
-VUE_APP_BASE_WS_API = '//localhsot:8721'
+VUE_APP_BASE_WS_API = '//127.0.0.1:8721'
 
 
 #数据引擎模块IP

zkqy-ui/src/views/orderMange/customerMange/index.vue

@@ -420,9 +420,6 @@ export default {
             trigger: "blur",
           },
         ],
-        customPhoneNumber: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
-        ],
       },
       // excel共通导入数据
       upload: {

zkqy-ui/src/views/orderMange/requisitionOrders/index.vue

@@ -224,7 +224,7 @@
               <el-select v-model="scope.row.materialId" filterable placeholder="请选择物料"
                         :disabled="requistionState?true:requistionOrdersType?true:false"
                          @change="handleMaterielInfo(scope)">
-                <el-option v-for="mtem in materielList" :key="mtem.id" :label="mtem.materielCode+''+mtem.materielName"
+                <el-option v-for="mtem in materielList" :key="mtem.id" :label="mtem.materieEncoding+'_'+mtem.materielName"
                            :value="mtem.materielCode"></el-option>
               </el-select>
             </template>