Merge branch 'orangeUrgent' into testToMerge

src/HDrpManagement/orderManage/details/tabs/setMaterial.vue

@@ -12,12 +12,13 @@
         <el-form-item :label="$t('材质') + ':'" prop="material">
           <el-select
               v-model="form.material"
+              multiple
               :placeholder="$t('请选择材质')"
-              @focus="queryType('itemmaterial')"
+              @focus="queryType('ordermaterial')"
               style="width: 80%"
           >
             <el-option
-                v-for="item in options.itemmaterial"
+                v-for="item in options.ordermaterial"
                 :key="item.value"
                 :label="$t(item.value)"
                 :value="item.value"
@@ -40,10 +41,10 @@ export default {
   data(){
     return {
       options:{
-        itemmaterial:[]
+        ordermaterial:[]
       },
       form:{
-        material:''
+        material:[]
       },
       rules:{
         material: [
@@ -58,9 +59,14 @@ export default {
   },
   methods:{
     dialogShow(){
-      this.form.material = this.data.material
+      let materials = this.data.material.split(',')
+      console.log(materials[0])
+      console.log(materials.length)
+      this.form.material = materials[0] && materials.length != 0 ? materials : []
     },
     onSubmit(){
+      this.form.material = this.form.material.join(',')
+      console.log(this.form.material)
       this.$refs.form.validate(async (valid)=>{
         if (!valid) return false
         const res = await this.$api.requested({