Merge remote-tracking branch 'origin/master'

zhaowei

2025-02-11 874a19bfb2d1437d8c1465263b76553a37835964

 src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue

@@ -14,8 +14,9 @@
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item label="所属部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag type="list" v-decorator="['departId']" :trigger-change="true" dictCode="sys_department,depart_name,depart_id" placeholder="请选择所属部门"/>
            <a-form-item label="所属车间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!--              <j-dict-select-tag type="list" v-decorator="['departId']" :trigger-change="true" dictCode="sys_department,depart_name,depart_id" placeholder="请选择所属部门"/>-->
              <j-select-equipment-production  v-model="model.departId" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
            </a-form-item>
          </a-col>
          <a-col :span="24">
@@ -43,10 +44,14 @@
  import pick from 'lodash.pick'
  import JFormContainer from '@/components/jeecg/JFormContainer'
  import JDictSelectTag from "@/components/dict/JDictSelectTag"
  import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
  import JSelectEquipmentProduction from '@comp/jeecgbiz/JSelectEquipmentProduction.vue'

  export default {
    name: 'NcDeviceCharactersForm',
    components: {
      JSelectEquipmentProduction,
      JSelectProduction,
      JFormContainer,
      JDictSelectTag,
    },
@@ -91,7 +96,7 @@
          },
          departId: {
            rules: [
              { required: true, message: '请选择部门分组!'},
              { required: true, message: '请选择所属车间!'},
            ]
          },
          controlSystem: {
@@ -139,6 +144,14 @@
      add () {
        this.edit({});
      },
      backProductionInfo(info) {
        // console.log(info)
        this.model.productionIds = this.model.selectedProduction;
        this.nextProductionOptions = info.map((item,index,arr)=>{
          let c = {label:item.text, value: item.value+""}
          return c;
        })
      },
      edit (record) {
        this.form.resetFields();
        this.model = Object.assign({}, record);