cuijian
2025-06-16 aa2f510e46e826b9851f9b5d21e642134d63e956
刀具寿命
已修改5个文件
141 ■■■■ 文件已修改
src/views/tms/modules/baseTools/BaseToolsListRight.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundDetailSelectList.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundModal.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundOrderModal.vue 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundOrderSelectList.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -482,50 +482,32 @@
              this.$refs.paraCommonToolModal.edit(record);
              this.$refs.paraCommonToolModal.title="详情";
              this.$refs.paraCommonToolModal.disableSubmit = true;
              this.$refs.paraCommonToolModal.disSeach = true;
              if(this.$refs.paraCommonToolModal.removeValidate) {
                this.$refs.paraCommonToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "2"){
              this.$refs.paraHoleToolsModal.edit(record);
              this.$refs.paraHoleToolsModal.title="详情";
              this.$refs.paraHoleToolsModal.disableSubmit = true;
              this.$refs.paraHoleToolsModal.disSeach = true;
              if(this.$refs.paraHoleToolsModal.removeValidate) {
                this.$refs.paraHoleToolsModal.removeValidate()
              }
            }else if(record.paramaTableName === "3"){
               this.$refs.paraThreadingToolModal.edit(record);
              this.$refs.paraThreadingToolModal.title="详情";
              this.$refs.paraThreadingToolModal.disableSubmit = true;
              this.$refs.paraThreadingToolModal.disSeach = true;
              if(this.$refs.paraThreadingToolModal.removeValidate) {
                this.$refs.paraThreadingToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "4"){
               this.$refs.paraMillToolModal.edit(record);
              this.$refs.paraMillToolModal.title="详情";
              this.$refs.paraMillToolModal.disableSubmit = true;
              this.$refs.paraMillToolModal.disSeach = true;
              if(this.$refs.paraMillToolModal.removeValidate) {
                this.$refs.paraMillToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "5"){
               this.$refs.paraTurningToolsModal.edit(record);
              this.$refs.paraTurningToolsModal.title="详情";
              this.$refs.paraTurningToolsModal.disableSubmit = true;
              this.$refs.paraTurningToolsModal.disSeach = true;
              if(this.$refs.paraTurningToolsModal.removeValidate) {
                this.$refs.paraTurningToolsModal.removeValidate()
              }
            }else if(record.paramaTableName === "6"){
               this.$refs.paraBladeModal.edit(record);
              this.$refs.paraBladeModal.title="详情";
              this.$refs.paraBladeModal.disableSubmit = true;
              this.$refs.paraBladeModal.disSeach = true;
              if(this.$refs.paraBladeModal.removeValidate) {
                this.$refs.paraBladeModal.removeValidate()
              }
            }
    },
      //禁用状态样式
src/views/tms/modules/outBound/OutboundDetailSelectList.vue
@@ -14,6 +14,26 @@
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
        @change="handleTableChange">
        <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
        <div :key="col.dataIndex">
          <a-input-number
            v-if="col.dataIndex === 'ratedLife'"
            :disabled="record.outboundQuantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'useLife'"
            :disabled="record.outboundQuantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
        </div>
      </template>
        <span slot="action" slot-scope="text, record">
          <a @click="handleOutbound(record)">出库</a>
        </span>
@@ -101,6 +121,18 @@
            align:"left",
            dataIndex: 'outboundQuantity'
          },
          {
          title:'额定寿命',
          align:"center",
          dataIndex: 'ratedLife',
          scopedSlots: { customRender: 'ratedLife' },
        },
        {
          title:'使用寿命',
          align:"center",
          dataIndex: 'useLife',
          scopedSlots: { customRender: 'useLife' },
        },
          // {
          //   title:'已出库数量',
          //   align:"left",
@@ -193,7 +225,9 @@
          {
            outBoundOrderId: this.mainId,
            outboundDetailId: record.id,
            outboundQuantity: record.outboundQuantity
            outboundQuantity: record.outboundQuantity,
            ratedLife:record.ratedLife,
            useLife:record.useLife
          }
        ]
        postAction(this.url.outbound, params).then(res=>{
@@ -205,7 +239,17 @@
            this.$message
          }
        })
      }
      },
      handleChange(value, key, column, index) {
        console.log(value, key, column, index)
        const temp = [...this.dataSource]
        const target = temp.filter(item => key === item.key)[index];
        if (target) {
          target[column.dataIndex] = value
          this.dataSource = temp
        }
      },
    }
  }
src/views/tms/modules/outBound/OutboundModal.vue
@@ -56,6 +56,20 @@
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'ratedLife'"
            :disabled="record.quantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'useLife'"
            :disabled="record.quantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
        </div>
      </template>
      <span slot="action" v-if="disableSubmit === false" slot-scope="text, record, index">
@@ -161,6 +175,18 @@
          title:'出库库位',
          align:"center",
          dataIndex: 'outboundLocation'
        },
        {
          title:'额定寿命',
          align:"center",
          dataIndex: 'ratedLife',
          scopedSlots: { customRender: 'ratedLife' },
        },
        {
          title:'使用寿命',
          align:"center",
          dataIndex: 'useLife',
          scopedSlots: { customRender: 'useLife' },
        },
        // {
        //   title:'出库状态;1.未出库;2.部分出库;3.出库完成',
@@ -302,7 +328,9 @@
              toolId: item.toolId,
              outboundQuantity: item.outboundQuantity,
              outStorehouseType: this.model.outStorehouseType,
              storageLocation: item.storageLocation
              storageLocation: item.storageLocation,
              ratedLife:item.ratedLife,
              useLife:item.useLife
            }
          })
          this.confirmLoading = true;
src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -18,7 +18,7 @@
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="出库类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outStorehouseType">
              <j-dict-select-tag :disabled="disableSubmit" @change="handleTypeChange" type="list" v-model="model.outStorehouseType" dictCode="out_storehouse_type" placeholder="请选择出库类型" disabled/>
              <j-dict-select-tag :disabled="disableSubmit" @change="handleTypeChange" type="list" v-model="model.outStorehouseType" dictCode="out_storehouse_type" placeholder="请选择出库类型"/>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -95,6 +95,21 @@
          <a-input-number
            v-if="col.dataIndex === 'outboundQuantity'"
            :disabled="record.quantity <= 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'ratedLife'"
            :disabled="record.quantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'useLife'"
            :disabled="record.quantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
@@ -206,6 +221,18 @@
            align:"center",
            dataIndex: 'outboundLocation'
          },
        //    {
        //   title:'额定寿命',
        //   align:"center",
        //   dataIndex: 'ratedLife',
        //   scopedSlots: { customRender: 'ratedLife' },
        // },
        // {
        //   title:'使用寿命',
        //   align:"center",
        //   dataIndex: 'useLife',
        //   scopedSlots: { customRender: 'useLife' },
        // },
          // {
          //   title:'出库状态;1.未出库;2.部分出库;3.出库完成',
          //   align:"center",
src/views/tms/modules/outBound/OutboundOrderSelectList.vue
@@ -256,7 +256,9 @@
          return {
            outBoundOrderId: this.selectedMainId,
            outboundDetailId: item.id,
            outboundQuantity: item.outboundQuantity
            outboundQuantity: item.outboundQuantity,
            ratedLife:item.ratedLife,
            useLife:item.useLife
          }
        })
        postAction(this.url.outbound, params).then(res=>{