Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/ExtResourceTypeSelect/index.vue

@@ -6,7 +6,7 @@
 */
 <template>
   <div>
-    <el-select v-model="form.materialType" :disabled="disabledVal">
+    <el-select v-model="form.extResourceTypeId" :disabled="disabledVal">
       <el-option
         v-for="(item,i) in materialTypeOptions"
         :key="i"
@@ -41,9 +41,9 @@ export default {
   watch: {
     'form.extWorkCenterId'(val) {
       if (val) {
-        this.$set(this.form, 'materialType', this.form.materialTypeId || '')
+        this.$set(this.form, 'extResourceTypeId', this.form.extResourceTypeId || '')
         if (!this.isFirst) {
-          this.$set(this.form, 'materialType', '')
+          this.$set(this.form, 'extResourceTypeId', '')
         }
         this.getMaterialType(val)
       }