Houjie
2025-05-26 c3f9133f259abacf02ae5acb2e5b4352f40d9b22
刀具刃磨/ 工具盘点、 库存预警界面修改
已修改5个文件
209 ■■■■■ 文件已修改
src/views/tms/lossBound/modules/LossboundModal.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/requirement/ToolSharpeningList .vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/requirement/modules/ToolsSharpeningModal.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue 111 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/storeEarlyWarning/ToolsStoreEarlyWarningList.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/lossBound/modules/LossboundModal.vue
@@ -205,7 +205,21 @@
          align: 'center',
          width: 150
        },
        {
          title: '报损原因',
          width: 150,
          dataIndex: 'lossReason',
          align: 'center',
          scopedSlots: { customRender: 'lossReason' }
        },
        {
          title: '报损数量',
          dataIndex: 'lossNumber',
          align: 'center',
          width: 150,
          scopedSlots: { customRender: 'lossNumber' }
        },
        {
          title: '中文名称',
          dataIndex: 'chineseName',
@@ -245,21 +259,7 @@
          dataIndex: 'goodsShelvesId',
          align: 'center'
        },
        {
          title: '报损原因',
          width: 150,
          dataIndex: 'lossReason',
          align: 'center',
          scopedSlots: { customRender: 'lossReason' }
        },
        {
          title: '报损数量',
          dataIndex: 'lossNumber',
          align: 'center',
          width: 150,
          scopedSlots: { customRender: 'lossNumber' }
        },
        {
          title: '备注',
src/views/tms/requirement/ToolSharpeningList .vue
@@ -5,18 +5,18 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="刀具名称">
              <j-input placeholder="请输入刀具名称" v-model="queryParam.toolName"></j-input>
            <a-form-item label="刀具编号">
              <a-input placeholder="请输入刀具编号" v-model="queryParam.toolId"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="刃磨结果">
              <j-input placeholder="请输入刃磨结果" v-model="queryParam.grindingResult"></j-input>
              <a-input placeholder="请输入刃磨结果" v-model="queryParam.sharpeningResult"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="刃磨时间">
              <a-range-picker v-model="queryParam.inspectionDateRange" @change="onInspectionDateChange" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
              <a-range-picker v-model="queryParam.sharpeningTime" @change="onInspectionDateChange" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -177,7 +177,6 @@
        deleteBatch: "/tms/toolSharpening/deleteBatch",
        exportXlsUrl: "/tms/toolSharpening/exportXls",
        importExcelUrl: "tms/toolSharpening/importExcel",
      },
      dictOptions:{},
      superFieldList:[],
@@ -193,8 +192,8 @@
  methods: {
    onInspectionDateChange: function(value, dateString) {
      this.queryParam.inspectionDateBegin = dateString[0]
      this.queryParam.inspectionDateEnd = dateString[1]
      this.queryParam.sharpeningTimeBegin = dateString[0]
      this.queryParam.sharpeningTimeEnd = dateString[1]
    },
@@ -220,10 +219,9 @@
      deleteAction(this.url.delete, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          this.reCalculatePage(1)
          this.$message.success(res.message)
          this.$refs.toolStockingBoundDetail.dataSource = []
          this.loadData()
          this.ipagination.current = 1
          this.loadData() // 强制从第一页加载
        } else {
          this.$message.warning(res.message)
        }
src/views/tms/requirement/modules/ToolsSharpeningModal.vue
@@ -45,7 +45,7 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="operator" label="责任人">
            <a-form-model-item prop="responsiblePerson" label="责任人">
              <j-dict-select-tag type="list" v-model="model.responsiblePerson" dictCode="sys_user,realname,id"
                                 placeholder="请选择责任人" :disabled="disableSubmit" />
            </a-form-model-item>
@@ -97,10 +97,15 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item label="备注" :labelCol="{span:2}" :wrapperCol="{span:21}" prop="remark">
          <a-col :span="12">
            <a-form-model-item label="存储位置" prop="storageLocation">
              <a-input placeholder="选择填写存储位置" v-model="model.positionCode" readOnly
                       :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="备注">
              <a-textarea v-model="model.remark" rows="3" placeholder="请输入备注" :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>
@@ -121,7 +126,7 @@
</template>
<script>
import { getAction, httpAction, postAction, requestPut } from '@/api/manage'
import { getAction, postAction, requestPut } from '@/api/manage'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import ToolsModal from '@views/tms/requirement/modules/ToolsModal.vue'
@@ -153,16 +158,12 @@
        sharpeningTime: [
          { required: true, message: '请选择刃磨日期!' }
        ],
        responsibleRerson: [
        responsiblePerson: [
          { required: true, message: '请选择责任人!' }
        ],
        sharpeningResult: [
          { required: true, message: '请输入刃磨结果及建议!' }
        ],
        responsiblePerson: [
          { required: true, message: '请选择责任人!' }
        ]
      },
      url: {
        add: '/tms/toolSharpening/add',
@@ -208,7 +209,7 @@
    edit(record) {
      console.log(record)
      this.model = Object.assign({}, record)
      // this.model = Object.assign({}, record)
      this.visible = true
      getAction(this.url.queryDetailList, {
        id: record.id,
@@ -216,8 +217,17 @@
        pageSize: 99999
      }).then((res) => {
        if (res.success) {
          console.log(res.result.records)
          this.dataSource = res.result.records
          const readOnlyData = res.result.records[0] || {}
          this.model = Object.assign({}, this.model, {
            paramaTableName: readOnlyData.paramaTableName_dictText,
            applicationType: readOnlyData.applicationType_dictText,
            provinceCity: readOnlyData.provinceCity,
            warehouseId: readOnlyData.warehouseId,
            positionCode: readOnlyData.positionCode,
            mainUnit: readOnlyData.mainUnit,
            toolModel: readOnlyData.toolModel
          })
        } else {
          this.dataSource = null
        }
src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
@@ -17,11 +17,11 @@
                                 :disabled="disableSubmit"></j-dict-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="handler">
              <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="请选择经手人" v-model="model.handler"
                                 :disabled="disableSubmit" />
            <a-form-model-item label="盘点名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
              <a-input v-model="model.stocktakingName" placeholder="请输入盘点名称"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -31,8 +31,17 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="盘点名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
              <a-input v-model="model.stocktakingName" placeholder="请输入盘点名称"></a-input>
            <a-form-model-item label="盘点时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
              <j-date placeholder="请选择盘点时间" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
                      style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="handler">
              <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="请选择经手人" v-model="model.handler"
                                 :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>
@@ -56,12 +65,7 @@
                      style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="盘点时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
              <j-date placeholder="请选择盘点时间" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
                      style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-input v-model="model.remark" placeholder="请输入备注" type="textarea"></a-input>
@@ -176,47 +180,6 @@
          align: 'center',
          width: 150
        },
        {
          title: '中文名称',
          dataIndex: 'chineseName',
          width: 150,
          align: 'center'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          width: 150,
          align: 'center'
        },
        {
          title: '刀具材料',
          width: 150,
          dataIndex: 'toolMaterial',
          align: 'center'
        },
        {
          title: '零件材料',
          width: 150,
          dataIndex: 'partMaterial',
          align: 'center'
        },
        {
          title: '厂家',
          width: 150,
          dataIndex: 'supplierId',
          align: 'center'
        },
        {
          title: '存储位置',
          width: 150,
          dataIndex: 'goodsShelvesId',
          align: 'center'
        },
        {
          title: '账面库存',
          width: 150,
@@ -269,6 +232,48 @@
          scopedSlots: { customRender: 'remark' }
        },
        {
          title: '中文名称',
          dataIndex: 'chineseName',
          width: 150,
          align: 'center'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          width: 150,
          align: 'center'
        },
        {
          title: '刀具材料',
          width: 150,
          dataIndex: 'toolMaterial',
          align: 'center'
        },
        {
          title: '零件材料',
          width: 150,
          dataIndex: 'partMaterial',
          align: 'center'
        },
        {
          title: '厂家',
          width: 150,
          dataIndex: 'supplierId',
          align: 'center'
        },
        {
          title: '存储位置',
          width: 150,
          dataIndex: 'goodsShelvesId',
          align: 'center'
        },
        {
          title: '操作',
          width: 150,
          dataIndex: 'action',
src/views/tms/storeEarlyWarning/ToolsStoreEarlyWarningList.vue
@@ -109,7 +109,7 @@
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        :rowClassName="setRowClassName"
        @change="handleTableChange">
        <template slot="htmlSlot" slot-scope="text">
@@ -273,6 +273,13 @@
      },
    },
    methods: {
      setRowClassName(record,index){
        //判断并返回行的样式名称
        if(record){
          return "bg-blue"
        }
      },
      initDictConfig(){
      },
      getSuperFieldList(){
@@ -300,4 +307,9 @@
</script>
<style scoped>
  @import '~@assets/less/common.less';
</style>
  ::v-deep .bg-blue{
    background-color:#C1194E;
  }
</style>