lyh
2025-02-11 ceacdcb1e517982c2dce40c4217a9de29e9dabcc
DNC修改所属部门为所属车间
已修改7个文件
65 ■■■■ 文件已修改
src/views/dnc/base/ActivitiSingExamineList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/AssignApproveUserList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/NcDeviceCharactersList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/ActivitiSingExamineList.vue
@@ -134,7 +134,7 @@
          width: 200,
        },
        {
          title: '所属部门',
          title: '所属车间',
          align: "center",
          dataIndex: 'departId_dictText',
          width: 220,
src/views/dnc/base/AssignApproveUserList.vue
@@ -134,7 +134,7 @@
          width: 200,
        },
        {
          title: '所属部门',
          title: '所属车间',
          align: "center",
          dataIndex: 'departId_dictText',
          width: 220,
src/views/dnc/base/NcDeviceCharactersList.vue
@@ -159,7 +159,7 @@
          width: 200,
        },
        {
          title: '所属部门',
          title: '所属车间',
          align: "center",
          dataIndex: 'departId_dictText',
          width: 220,
src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue
@@ -14,8 +14,8 @@
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item label="所属部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag :disabled="formDisabled" 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-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">
@@ -57,10 +57,12 @@
  import pick from 'lodash.pick'
  import JFormContainer from '@/components/jeecg/JFormContainer'
  import JDictSelectTag from "@/components/dict/JDictSelectTag"
  import JSelectEquipmentProduction from '@comp/jeecgbiz/JSelectEquipmentProduction.vue'
  export default {
    name: 'ActivitiSignExamineForm',
    components: {
      JSelectEquipmentProduction,
      JFormContainer,
      JDictSelectTag,
    },
@@ -155,6 +157,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);
src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue
@@ -14,8 +14,8 @@
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item label="所属部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag :disabled="formDisabled" 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-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">
@@ -39,10 +39,12 @@
  import pick from 'lodash.pick'
  import JFormContainer from '@/components/jeecg/JFormContainer'
  import JDictSelectTag from "@/components/dict/JDictSelectTag"
  import JSelectEquipmentProduction from '@comp/jeecgbiz/JSelectEquipmentProduction.vue'
  export default {
    name: 'AssignApproveUserForm',
    components: {
      JSelectEquipmentProduction,
      JFormContainer,
      JDictSelectTag,
    },
@@ -137,6 +139,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);
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);
src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue
@@ -34,12 +34,12 @@
              return parseInt(index) + 1
            }
          },
          { title: '设备名称', dataIndex: 'deviceName', align: 'center' },
          { title: '设备编号', dataIndex: 'deviceNo', align: 'center' },
          { title: '设备型号', dataIndex: 'deviceModel', align: 'center' },
          { title: '所属部门', dataIndex: 'departName', align: 'center' },
          { title: '设备分组', dataIndex: 'groupName', align: 'center' },
          { title: '控制系统', dataIndex: 'controlSystem', align: 'center' }
          { title: '设备名称', dataIndex: 'equipmentName', align: 'center' },
          { title: '设备编号', dataIndex: 'equipmentId', align: 'center' },
          { title: '设备类型', dataIndex: 'equipmentType', align: 'center' },
          { title: '设备型号', dataIndex: 'equipmentModel', align: 'center' },
          { title: '所属车间', dataIndex: 'productionName', align: 'center' },
          { title: '数控系统', dataIndex: 'controlSystem', align: 'center' }
        ],
        url: {
          list: '/doc/relative/get/device'