Merge remote-tracking branch 'origin/master'

zhangherong

14 小时以前 fcc3f96a76d35abc14210cfcaaf4d218fd194ad3

 src/views/base/FactoryManager.vue

@@ -86,7 +86,7 @@
                </a-tree-select>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
                <a-input-number v-model="model.sorter"/>
                <a-input-number v-model="model.sorter" style="width:100%"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
                <a-textarea placeholder="请输入备注" v-model="model.remark"/>
@@ -166,7 +166,9 @@
          edges: []
        },
        validatorRules: {
          factoryName: [{ required: true, message: '请输入产线/车间名称!' }]
          factoryCode:[{ required: true, message: '请输入工厂/车间/产线编号!' }],
          factoryName:[{ required: true, message: '请输入工厂/车间/产线名称!' }],
          productionType:[{ required: false, message: '请选择产线类型!' }],
        },
        url: {
          delete: '/base/factory/delete',
@@ -348,6 +350,7 @@
        this.setValuesToForm(record)
        if(record.factoryCategory == '3'){
          this.$refs.userFactory.show(record.id)
          this.validatorRules.productionType[0].required = true
        }else{
          this.$refs.userFactory.factoryId = ''
        }