Merge remote-tracking branch 'origin/master'

zhaowei

6 天以前 886748a39efb188d8008d41f2718eb78f3006ddd

 src/views/eam/base/EamProductionUserManagement.vue

@@ -21,18 +21,9 @@
          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入车间名称"/>
          <!-- 树-->
          <a-col :md="10" :sm="24">
            <a-tree
              checkable
              multiple
              @select="onSelect"
              @check="onCheck"
              :selectedKeys="selectedKeys"
              :checkedKeys="checkedKeys"
              :treeData="departTree"
              :checkStrictly="checkStrictly"
              :expandedKeys="expandedKeys"
              :autoExpandParent="autoExpandParent"
              @expand="onExpand"/>
            <a-tree checkable multiple @select="onSelect" @check="onCheck" :selectedKeys="selectedKeys"
                    :checkedKeys="checkedKeys" :treeData="departTree" :checkStrictly="checkStrictly"
                    :expandedKeys="expandedKeys" :autoExpandParent="autoExpandParent" @expand="onExpand"/>
          </a-col>
        </div>
      </a-card>
@@ -61,10 +52,10 @@
            <template v-if="selectedKeys.length>0">
              <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol"
                            :wrapperCol="wrapperCol">
                <a-form-model-item label="机构编码">
                <a-form-model-item label="机构编码" prop="factoryCode">
                  <a-input placeholder="请输入机构编码" v-model="model.factoryCode"/>
                </a-form-model-item>
                <a-form-model-item expandedKeys prop="factoryName" label="机构名称">
                <a-form-model-item prop="factoryName" label="机构名称">
                  <a-input placeholder="请输入机构名称" v-model="model.factoryName"/>
                </a-form-model-item>
                <a-form-model-item expandedKeys label="上级车间">
@@ -143,7 +134,8 @@
          sm: { span: 16 }
        },
        validatorRules: {
          factoryName: [{ required: true, message: '请输入机构名称!', trigger: 'change' }]
          factoryCode: [{ required: true, message: '请输入机构编号', trigger: 'change' }],
          factoryName: [{ required: true, message: '请输入机构名称', trigger: 'change' }]
        },
        url: {
          getProductionTreeList: '/eam/BaseFactory/queryTreeList',