Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-03 e27722cc75b3090ed3eca54fc5651fa636b40453

Merge remote-tracking branch 'origin/master'

 src/views/tms/modules/inbound/InboundListRight.vue

@@ -305,7 +305,7 @@
        }
        // 打开新增模态框，并传递当前选中的节点
          this.$refs.modalForm.add(this.nodeSelected);
          this.$refs.modalForm.title = "新增通用参数类型工具";
          this.$refs.modalForm.title = "新增工具入库";
          this.$refs.modalForm.disableSubmit = false;
      },
      handleDelete(id) {

 src/views/tms/modules/inbound/InboundModel.vue

@@ -34,19 +34,11 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">  
          <a-col :span="24 / 2">
            <a-form-item label="入库数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入入库数量"  :disabled="disableSubmit" v-decorator="['in_number', validatorRules.applicationReason]" />
            </a-form-item>
          </a-col>
        </a-row>
       
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借用出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借出工具</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="toolingShow && !disableSubmit">选择工具</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectSharpenList()" v-show="sharpenShow && !disableSubmit">选择刃磨出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectSharpenList()" v-show="sharpenShow && !disableSubmit">选择刃磨工具</a-button>
    <a-table
      ref="table"
      bordered
@@ -170,7 +162,7 @@
      barcodeCurrentType: false,
      inboundOrderId:'',
      validatorRules: {
        type: {
        inStorehouseType: {
          rules: [
            {
              required: true,
@@ -178,7 +170,7 @@
            },
          ],
        },
        inboundDate: {
        inboundTime: {
          rules: [
            {
              required: true,
@@ -186,23 +178,12 @@
            },
          ],
        },
        applicant: {
          rules: [
            {
              required: true,
              message: '请选择申请人!',
            },
          ],
        },
      },
      url: {
        add: '/tms/inboundOrder/add',
        edit: '/tms/inboundOrder/edit',
        queryByUserName: '/sys/user/queryByUserName',
        addInStorage: '/tms/inboundOrder/addInStorage',
        toolingList:'/tms/baseTools/list',
        queryAccountList:'/tooling/storage/queryAccountList',
        querySharpenList:'/sharpen/sharpenDetail/querySharpenList',
        queryReturnList:'/returnInventory/queryReturnList',
        querySharpenList:'/tms/toolLedgerDetail/list',
        queryReturnList:'/tms/toolLedgerDetail/list',
        detailList:'/tms/inboundDetail/list',
      },
      toolingOptions:[],
@@ -325,13 +306,7 @@
          that.confirmLoading = true
          let formData = Object.assign(this.model, values)
          formData.detailData = this.dataSource
          let http = ''
          if(this.model.id){
            http = this.url.edit
          }else{
            http = this.url.add
          }
          postAction(http, formData)
          postAction(this.url.addInStorage, formData)
            .then((res) => {
              if (res.success) {
                that.$message.success(res.message)
@@ -491,14 +466,11 @@
      for (let i = 0; i < data.length; i++) {
        this.dataSource.push({
          toolCodeId:data[i].id,
          toolingId: data[i].toolingId || data[i].id,
          toolCode: data[i].toolCode,
          chineseName: data[i].chineseName,
          toolModel: data[i].toolModel,
          applicationType: data[i].applicationTypeName,
          unitName: data[i].unitName || data[i].unitId_dictText,
          onlyCode:data[i].onlyCode,
          noAccountQuantity:data[i].noAccountQuantity,
          inStorageQuantity:data[i].storageQuantity
        })
      }

 src/views/tms/modules/inboundOrder/InboundOrderModel.vue

@@ -109,9 +109,9 @@
        </a-row>
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="returnShow && !disableSubmit">选择借用出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借出工具</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="toolingShow && !disableSubmit">选择工具</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="sharpenShow && !disableSubmit">选择刃磨出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectSharpenList()" v-show="sharpenShow && !disableSubmit">选择刃磨工具</a-button>
    <a-table
      ref="table"
      bordered
@@ -235,7 +235,7 @@
      barcodeCurrentType: false,
      inboundOrderId:'',
      validatorRules: {
        type: {
        inStorehouseType: {
          rules: [
            {
              required: true,
@@ -243,19 +243,19 @@
            },
          ],
        },
        inboundDate: {
        inboundTime: {
          rules: [
            {
              required: true,
              message: '请选择申请入库日期!',
              message: '请选择申请入库时间!',
            },
          ],
        },
        applicant: {
        applicationReason: {
          rules: [
            {
              required: true,
              message: '请选择申请人!',
              message: '请填写申请原因!',
            },
          ],
        },
@@ -263,11 +263,9 @@
      url: {
        add: '/tms/inboundOrder/add',
        edit: '/tms/inboundOrder/edit',
        queryByUserName: '/sys/user/queryByUserName',
        toolingList:'/tms/baseTools/list',
        queryAccountList:'/tms/baseTools/list',
        querySharpenList:'/tms/baseTools/list',
        queryReturnList:'/tms/baseTools/list',
        querySharpenList:'/tms/toolLedgerDetail/list',
        queryReturnList:'/tms/toolLedgerDetail/list',
        detailList:'/tms/inboundDetail/list',
      },
      toolingOptions:[],
@@ -556,15 +554,12 @@
      for (let i = 0; i < data.length; i++) {
        this.dataSource.push({
          toolCodeId:data[i].id,
          toolingId: data[i].toolingId || data[i].id,
          toolCode: data[i].toolCode,
          chineseName: data[i].chineseName,
          chineseName: data[i].chineseName || data[i].toolName,
          toolModel: data[i].toolModel,
          applicationType: data[i].applicationTypeName,
          unitName: data[i].unitName || data[i].unitId_dictText,
          onlyCode:data[i].onlyCode,
          noAccountQuantity:data[i].noAccountQuantity,
          inStorageQuantity:data[i].storageQuantity
          onlyCode:data[i].toolNum,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity
        })
      }
      //this.ipaginationm.total = this.dataSource.length

 src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue

@@ -78,43 +78,37 @@
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolingNum',
          dataIndex: 'toolCode',
          sorter: true,
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'toolNum',
          sorter: true,
        },
        {
          title: '工具名称',
          align: 'center',
          dataIndex: 'toolingName',
          dataIndex: 'toolName',
          sorter: true,
        },
         {
          title: '唯一编码',
          title: '工具类型',
          align: 'center',
          dataIndex: 'onlyCode',
          dataIndex: 'applicationTypeName',
          sorter: true,
        },
        {
          title: '入库数量',
          title: '型号/图号',
          align: 'center',
          dataIndex: 'inStorageQuantity',
          dataIndex: 'toolModel',
          sorter: true,
        },
        {
          title: '工具分类',
         {
          title: '数量',
          align: 'center',
          dataIndex: 'toolingCategoryName',
          sorter: true,
        },
        {
          title: '规格型号',
          align: 'center',
          dataIndex: 'model',
          sorter: true,
        },
        {
          title: '单位',
          align: 'center',
          dataIndex: 'unitName',
          dataIndex: 'quantity',
          sorter: true,
        },
      ],
@@ -135,16 +129,12 @@
        showSizeChanger: true,
        total: 0,
      },
      isorter: {
        column: 'num',
        order: 'desc',
      },
      departTree: [],
      visible: false,
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/tms/baseTools/list',
         list: '/tms/toolLedgerDetail/list',
         queryKnifeBom:'/toolingStorage/mesToolingOutbounds/queryKnifeBom'
      },
    }
@@ -176,6 +166,7 @@
      let that = this
      this.loading = true
      let params = this.getQueryParams() //查询条件
     params["status"] = "2"
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
          for (let i = 0; i < res.result.records.length; i++) {
@@ -200,7 +191,7 @@
      this.loadData(1)
    },
    getQueryParams() {
      let param = Object.assign({}, this.queryParam, this.isorter)
      let param = Object.assign({}, this.queryParam)
      param.field = this.getQueryField()
      param.pageNo = this.ipagination.current
      param.pageSize = this.ipagination.pageSize
@@ -228,34 +219,17 @@
    },
    handleTableChange(pagination, filters, sorter) {
      //TODO 筛选
      if (Object.keys(sorter).length > 0) {
        this.isorter.column = sorter.field
        this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
      }
      // if (Object.keys(sorter).length > 0) {
      //   this.isorter.column = sorter.field
      //   this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
      // }
      this.ipagination = pagination
      this.loadData()
    },
    handleSubmit() {
      if (this.selectionRows.length > 0) {
         let params = this.getQueryParams() //查询条件
          params['onlyCode'] = this.selectionRows[0].onlyCode;
        getAction(this.url.queryKnifeBom, params).then((res) => {
        if (res.success) {
          this.prepareKnifeDetailList = res.result
          this.$bus.$emit('selectionRows', this.prepareKnifeDetailList)
        }
         
        if (res.code === 510) {
          this.$message.warning(res.message)
        }
        this.loading = false
        
      })
        this.searchReset(0)
        this.close()
      } else {
        this.$message.warning('请选择一条数据')
      }
      this.$bus.$emit('selectionRows', this.selectionRows)
      this.searchReset(0)
      this.close()
    },
    onSelectChange(selectionRows) {
      this.selectionRows = selectionRows

 src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue

@@ -78,43 +78,37 @@
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolingNum',
          dataIndex: 'toolCode',
          sorter: true,
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'toolNum',
          sorter: true,
        },
        {
          title: '工具名称',
          align: 'center',
          dataIndex: 'toolingName',
          dataIndex: 'toolName',
          sorter: true,
        },
         {
          title: '工具类型',
          align: 'center',
          dataIndex: 'applicationTypeName',
          sorter: true,
        },
        {
          title: '唯一编码',
          title: '型号/图号',
          align: 'center',
          dataIndex: 'onlyCode',
          dataIndex: 'toolModel',
          sorter: true,
        },
        {
          title: '入库数量',
         {
          title: '数量',
          align: 'center',
          dataIndex: 'inStorageQuantity',
          sorter: true,
        },
        {
          title: '工具分类',
          align: 'center',
          dataIndex: 'toolingCategoryName',
          sorter: true,
        },
        {
          title: '规格型号',
          align: 'center',
          dataIndex: 'model',
          sorter: true,
        },
        {
          title: '单位',
          align: 'center',
          dataIndex: 'unitName',
          dataIndex: 'quantity',
          sorter: true,
        },
      ],
@@ -135,16 +129,12 @@
        showSizeChanger: true,
        total: 0,
      },
      isorter: {
        column: 'num',
        order: 'desc',
      },
      departTree: [],
      visible: false,
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/sharpen/sharpenDetail/querySharpenList',
         list: '/tms/toolLedgerDetail/list',
      },
    }
  },
@@ -175,7 +165,7 @@
      let that = this
      this.loading = true
      let params = this.getQueryParams() //查询条件
      params["sharpenStatus"] = 1
      params["status"] = "5"
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
          for (let i = 0; i < res.result.records.length; i++) {
@@ -200,7 +190,7 @@
      this.loadData(1)
    },
    getQueryParams() {
      let param = Object.assign({}, this.queryParam, this.isorter)
      let param = Object.assign({}, this.queryParam)
      param.field = this.getQueryField()
      param.pageNo = this.ipagination.current
      param.pageSize = this.ipagination.pageSize
@@ -228,10 +218,6 @@
    },
    handleTableChange(pagination, filters, sorter) {
      //TODO 筛选
      if (Object.keys(sorter).length > 0) {
        this.isorter.column = sorter.field
        this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
      }
      this.ipagination = pagination
      this.loadData()
    },