houjie
2023-08-19 a01a0b502447a0ca0a45f1849cde4f0bed1ef1f8
备品备件:调整  部门
已修改7个文件
156 ■■■■ 文件已修改
src/views/spare/SparePartReceiveList.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/SparePartReceiveList.vue
@@ -137,7 +137,12 @@
    </div>
    <a-tabs defaultActiveKey='1'>
      <a-tab-pane tab='领用申请明细单' key='1'>
        <spare-part-receive-deatil-list :mainId='sparesScrapDetailMainId' />
        <div
          class='table-operator'
          style='margin:-20px'>
          <spare-part-receive-deatil-list :mainId='sparesScrapDetailMainId' />
        </div>
      </a-tab-pane>
    </a-tabs>
    <spare-part-receive-modal ref='modalForm' @ok='modalFormOk' />
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
@@ -39,11 +39,19 @@
                dictCode="sys_depart,depart_name,id,del_flag!='1'"
                v-decorator="['departId', validatorRules.departId]"
              />-->
              <a-select
<!--              <a-select
                :placeholder="'请选择领用部门'"
                :options="this.departs"
                :disabled="disableSubmit"
                style="width: 100%"
                v-model='model.departId'
              />-->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择领用部门"
                tree-default-expand-all
                v-model='model.departId'
              />
            </a-form-item>
@@ -172,6 +180,7 @@
  data() {
    return {
      departId:[],
      treeData:[],
      columns: [
        {
          title: '#',
@@ -310,6 +319,7 @@
      url: {
        add: '/spare/sparePartCancellingStocks/add',
        getSysDeparts: "/eam/equipment/getSysDeparts",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        edit: '/spare/sparePartCancellingStocks/edit'
      },
@@ -350,10 +360,18 @@
    })
  },
  created() {
    this.getSysDeparts()
  },
  methods: {
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    getSysDeparts() {
      getAction(this.url.getSysDeparts).then((res) => {
        if (res.success) {
@@ -387,6 +405,7 @@
      that.form.resetFields()
      that.model = Object.assign({}, record)
      that.visible = true
      that.initOptions()
      that.warehouseId = record.warehouseId
      if (record.sparePartCancellingStocksDetailList != undefined) {
        const temp = [...record.sparePartCancellingStocksDetailList]
src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
@@ -31,13 +31,21 @@
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-select
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择领用部门"
                tree-default-expand-all
                v-decorator="['departId', validatorRules.departId]"
              />
<!--              <a-select
                :placeholder="'请选择领用部门'"
                :disabled="disableSubmit"
                :options="this.departs"
                style="width: 100%"
                v-decorator="['departId', validatorRules.departId]"
              />
              />-->
<!--              <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
@@ -172,6 +180,7 @@
  data() {
    return {
      disabled:false,
      treeData:[],
      departs: [],
      columns: [
        {
@@ -317,6 +326,7 @@
      },
      url: {
        add: "/spare/sparePartOutbound/add",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        getSysDeparts: "/eam/equipment/getSysDeparts",
        edit: "/spare/sparePartOutbound/edit",
      },
@@ -358,7 +368,6 @@
  },
created() {
  this.getSysDeparts();
},
  methods: {
    getSysDeparts() {
@@ -394,6 +403,7 @@
      that.form.resetFields();
      that.model = Object.assign({}, record);
      that.visible = true;
      that.initOptions()
      that.warehouseId = record.warehouseId
      if (record.sparePartOutboundDetailList != undefined) {
        const temp = [...record.sparePartOutboundDetailList];
@@ -408,7 +418,15 @@
        this.codeDisable = false;
      }
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    close() {
      this.$emit('close');
      this.visible = false;
src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
@@ -39,13 +39,21 @@
                dictCode="sys_depart,depart_name,id,del_flag!='1'"
                v-decorator="['departId', validatorRules.departId]"
              />-->
              <a-select
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择采购部门"
                tree-default-expand-all
                v-decorator="['departId', validatorRules.departId]"
              />
<!--              <a-select
                :placeholder="'请选择采购部门'"
                :options="this.departs"
                style="width: 100%"
                :disabled="disableSubmit"
                v-decorator="['departId', validatorRules.departId]"
              />
              />-->
            </a-form-item>
          </a-col>
        </a-row>
@@ -214,6 +222,7 @@
  },
  data() {
    return {
      treeData:[],
      departs: [],
      columns: [
        {
@@ -354,6 +363,7 @@
        getSysDeparts: "/eam/equipment/getSysDeparts",
        add: '/spare/sparePartPurchaseStorage/add',
        edit: '/spare/sparePartPurchaseStorage/edit',
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        getSuppliers: '/spare/sparePartPurchaseStorageDeatil/getSuppliers',
        getWarehouseAreas: '/spare/sparePartPurchaseStorageDeatil/getWarehouseAreas',
        getWarehouseLocations: '/spare/sparePartPurchaseStorageDeatil/getWarehouseLocations',
@@ -390,9 +400,7 @@
    })
  },
  created() {
    this.getSysDeparts();
  },
  created() {},
  methods: {
    getSysDeparts() {
      getAction(this.url.getSysDeparts).then((res) => {
@@ -424,6 +432,7 @@
      that.form.resetFields()
      that.model = Object.assign({}, record)
      that.visible = true
      that.initOptions();
      if (record.sparePartPurchaseStorageDeatilList != undefined) {
        const temp = [...record.sparePartPurchaseStorageDeatilList]
        that.dataSource = temp
@@ -437,7 +446,15 @@
        this.codeDisable = false
      }
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    close() {
      this.$emit('close')
      this.visible = false
src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
@@ -23,10 +23,18 @@
          </a-col>
          <a-col :span='12'>
            <a-form-model-item label='领用部门' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='departId'>
              <a-select
<!--              <a-select
                :placeholder="'请选择领用部门'"
                :options="this.departs"
                style="width: 100%"
                v-model='model.departId'
              />-->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择领用部门"
                tree-default-expand-all
                v-model='model.departId'
              />
            </a-form-model-item>
@@ -103,6 +111,7 @@
    return {
      bordered:true,
      departs: [],
      treeData:[],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
@@ -335,6 +344,7 @@
        add: '/spare/sparePartReceive/add',
        edit: '/spare/sparePartReceive/edit',
        getSysDeparts: "/eam/equipment/getSysDeparts",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        sparesReceiveDetail: {
          list: '/spare/sparePartReceive/querySparePartReceiveDeatilByMainId'
        }
@@ -362,7 +372,7 @@
    })
  },
  created() {
    this.getSysDeparts();
    this.initOptions();
  },
  methods: {
    getSysDeparts() {
@@ -372,6 +382,15 @@
        }
      })
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    selectEquipmentList() {
      let ids = []
      debugger
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -18,10 +18,18 @@
                v-model='model.departId'
                dictCode="sys_depart,depart_name,id,del_flag!='1'"
              />-->
              <a-select
<!--              <a-select
                :placeholder="'请选择领用部门'"
                :options="this.departs"
                style="width: 100%"
                v-model='model.departId'
              />-->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择领用部门"
                tree-default-expand-all
                v-model='model.departId'
              />
            </a-form-model-item>
@@ -97,6 +105,7 @@
  },
  data() {
    return {
      treeData:[],
      departs:[],
      bordered:true,
      labelCol: {
@@ -386,6 +395,7 @@
        add: '/spare/sparePartScrap/add',
        edit: '/spare/sparePartScrap/edit',
        getSysDeparts: "/eam/equipment/getSysDeparts",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        queryById: '/spare/sparePartScrap/queryById',
        sparesScrapDetail: {
          list: '/spare/sparePartScrap/querySparesScrapDetailByMainId'
@@ -414,9 +424,18 @@
    })
  },
  created() {
    this.getSysDeparts()
    this.initOptions()
  },
  methods: {
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    getSysDeparts() {
      getAction(this.url.getSysDeparts).then((res) => {
        if (res.success) {
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
@@ -18,12 +18,20 @@
                v-model='model.departId'
                dictCode="sys_depart,depart_name,id,del_flag!='1'"
              />-->
              <a-select
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择申请部门"
                tree-default-expand-all
                v-model='model.departId'
              />
<!--              <a-select
                :placeholder="'请选择申请部门'"
                :options="this.departs"
                style="width: 100%"
                v-model='model.departId'
              />
              />-->
            </a-form-model-item>
          </a-col>
          <a-col :span='12'>
@@ -94,6 +102,7 @@
  },
  data() {
    return {
      treeData:[],
      bordered:true,
      departs: [],
      labelCol: {
@@ -293,6 +302,7 @@
        add: '/spare/sparePartRequirement/add',
        edit: '/spare/sparePartRequirement/edit',
        queryById: '/spare/sparePartRequirement/queryById',
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        getSysDeparts: "/eam/equipment/getSysDeparts",
        sparesScrapRequirementDetail: {
          list: '/spare/sparePartRequirement/querySparesScrapRequirementDetailByMainId'
@@ -326,9 +336,18 @@
    })
  },
  created() {
    this.getSysDeparts()
    this.initOptions()
  },
  methods: {
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    getSysDeparts() {
      getAction(this.url.getSysDeparts).then((res) => {
        if (res.success) {