Merge remote-tracking branch 'origin/master'

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

@@ -410,9 +410,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        customName: [
-          { required: true, message: "客户名称不能为空", trigger: "blur" },
-        ],
+
         customNo: [
           { required: true, message: "客户编号不能为空", trigger: "blur" },
           {
@@ -420,9 +418,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>