4c8b185fea72bc3bb8fc380a196b8fe2a8e5f1af..2f519ead537a0b38019bbf64a6075cbb6e08f9b4
2025-07-09 hyingbo
车间大屏看板设置设备默认图片
2f519e 对比 | 目录
2025-07-09 cuijian
现场问题修改
9b6bd0 对比 | 目录
已修改14个文件
187 ■■■■ 文件已修改
src/views/mdc/base/MdcWorkshopSignage.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/InboundOrderList.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/BaseToolsListRight.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaBladeModal.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaCommonToolModal.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaMillToolModal.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inbound/InboundModel.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/InboundDetailList.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/InboundOrderModel.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/requirement/modules/ToolsModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/MdcWorkshopSignage.vue
@@ -62,7 +62,7 @@
                class="status-image"
              ></div>
              <div
                :style="{ backgroundImage: `url(${getImgView(item.equipmentImage)})` }"
                :style="{ backgroundImage: `url(${getImgEquipmentView(item.equipmentImage)})` }"
                class="device-image"
              ></div>
            </div>
@@ -196,6 +196,20 @@
        }
        return getFileAccessHttpUrl(text)
      },
      /**
       * 设备图片预览
       * @param text 图片地址
       */
      getImgEquipmentView(text) {
        if (text && text.indexOf(',') > 0) {
          text = text.substring(0, text.indexOf(','))
        }
        if (text == null || text == '') {
          return require('../../../assets/default.png')
        }
        return getFileAccessHttpUrl(text)
      },
      /**
       * 点击保存按钮调用接口保存拖拽后的位置与设备图标尺寸
src/views/tms/InboundOrderList.vue
@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :md="6" :sm="8">
            <a-form-item label="入库申请单编号">
              <a-input placeholder="请输入入库申请单编号" v-model="queryParam.inboundNum" />
              <j-input placeholder="请输入入库申请单编号" v-model="queryParam.inboundNum" />
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="8">
@@ -151,11 +151,6 @@
          title: '审核状态',
          align: 'center',
          dataIndex: 'orderStatus_dictText',
        },
         {
          title: '借用单号',
          align: 'center',
          dataIndex: 'borrowNum',
        },
         {
          title: '审批意见',
src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -539,6 +539,8 @@
        }else{
          this.dataSource = [];
          this.clearPara()
          this.loading = false;
          return
        }
        getAction(httpUrl, params)
          .then((res) => {
src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -121,7 +121,14 @@
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="positionCode" label="库位号">
              <a-input :placeholder="disableSubmit?'':'请输入库位号'" v-model="model.positionCode" :disabled="disableSubmit"/>
              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="库位号">
             <a-select
                :disabled="disableSubmit"
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.positionCode"
              />
            </a-form-item>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -336,10 +343,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { getSystemConfigValue } from '@api/api'
  import { duplicateCheck } from '@/api/api'//重复校验
import { duplicateCheck } from '@/api/api'//重复校验
import { ajaxGetDictItems } from '@/api/api'
export default {
  name: 'ParaHoleToolsModal',
@@ -420,9 +426,15 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
    }
  },
  created() {
     ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    add(nodeSelected) {
src/views/tms/modules/baseTools/ParaCommonToolModal.vue
@@ -120,7 +120,12 @@
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="positionCode" label="库位号">
              <a-input :placeholder="disableSubmit?'':'请输入库位号'" v-model="model.positionCode" :disabled="disableSubmit"/>
               <a-select
                :disabled="disableSubmit"
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.positionCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -190,10 +195,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { getSystemConfigValue } from '@api/api'
  import { duplicateCheck } from '@/api/api'//重复校验
import { duplicateCheck } from '@/api/api'//重复校验
import { ajaxGetDictItems } from '@/api/api'
export default {
  name: 'ParaCommonToolModal',
@@ -247,9 +251,15 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
       locationCodeOptions:[]
    }
  },
  created() {
     ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    add(nodeSelected) {
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -120,7 +120,12 @@
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="positionCode" label="库位号">
              <a-input :placeholder="disableSubmit?'':'请输入库位号'" v-model="model.positionCode" :disabled="disableSubmit"/>
              <a-select
                :disabled="disableSubmit"
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.positionCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -379,10 +384,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { getSystemConfigValue } from '@api/api'
  import { duplicateCheck } from '@/api/api'//重复校验
import { duplicateCheck } from '@/api/api'//重复校验
import { ajaxGetDictItems } from '@/api/api'
export default {
  name: 'ParaHoleToolsModal',
@@ -460,9 +464,15 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
    }
  },
  created() {
    ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    add(nodeSelected) {
src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -120,7 +120,12 @@
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="positionCode" label="库位号">
              <a-input :placeholder="disableSubmit?'':'请输入库位号'" v-model="model.positionCode" :disabled="disableSubmit"/>
              <a-select
                :disabled="disableSubmit"
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.positionCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -384,10 +389,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { getSystemConfigValue } from '@api/api'
  import { duplicateCheck } from '@/api/api'//重复校验
import { duplicateCheck } from '@/api/api'//重复校验
import { ajaxGetDictItems } from '@/api/api'
export default {
  name: 'ParaHoleToolsModal',
@@ -474,9 +478,15 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
    }
  },
  created() {
    ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    add(nodeSelected) {
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -120,7 +120,12 @@
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="positionCode" label="库位号">
              <a-input :placeholder="disableSubmit?'':'请输入库位号'" v-model="model.positionCode" :disabled="disableSubmit"/>
              <a-select
                :disabled="disableSubmit"
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.positionCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -325,11 +330,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { getSystemConfigValue } from '@api/api'
  import { duplicateCheck } from '@/api/api'//重复校验
import JThirdAppDropdown from '../../../../components/jeecgbiz/thirdApp/JThirdAppDropdown.vue'
import { duplicateCheck } from '@/api/api'//重复校验
import { ajaxGetDictItems } from '@/api/api'
export default {
  name: 'ParaHoleToolsModal',
@@ -413,9 +416,15 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
    }
  },
  created() {
    ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    add(nodeSelected) {
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -121,7 +121,12 @@
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="positionCode" label="库位号">
              <a-input :placeholder="disableSubmit?'':'请输入库位号'" v-model="model.positionCode" :disabled="disableSubmit"/>
              <a-select
                :disabled="disableSubmit"
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.positionCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -403,10 +408,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { getSystemConfigValue } from '@api/api'
  import { duplicateCheck } from '@/api/api'//重复校验
import { duplicateCheck } from '@/api/api'//重复校验
import { ajaxGetDictItems } from '@/api/api'
export default {
  name: 'ParaHoleToolsModal',
@@ -490,9 +494,15 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
    }
  },
  created() {
    ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    add(nodeSelected) {
src/views/tms/modules/inbound/InboundModel.vue
@@ -283,6 +283,7 @@
      return filterObj(this.param)
    },
    add (nodeSelected) {
      this.qrList = []
      this.classifyId = nodeSelected.key
      this.model.classifyNum =  nodeSelected.entity.classifyId
      this.model.typeName =  nodeSelected.entity.typeName
@@ -325,17 +326,20 @@
    },
    handleOk() {
      const that = this
      if(this.dataSource.length == 0){
        that.$message.error("请先选择需要入库的工具!")
        return
      }
      // 触发表单验证
      this.form.validateFields((err, values) => {
        if (!err) {
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = true
          let formData = Object.assign(this.model, values)
          formData.detailData = this.dataSource
          formData.classifyId = this.classifyId
          postAction(this.url.addInStorage, formData)
          this.model.detailData = this.dataSource
          this.model.classifyId = this.classifyId
          postAction(this.url.addInStorage, this.model)
            .then((res) => {
              if (res.success) {
                if(formData.inStorehouseType === '1'){
                if(this.model.inStorehouseType === '1'){
                  this.qrList = res.result.map((content, i) => ({
                  content:res.result[i].content,
                  base64: res.result[i].image
src/views/tms/modules/inboundOrder/InboundDetailList.vue
@@ -61,6 +61,11 @@
          dataIndex: 'applicationType',
          align: 'center',
        },
        {
          title: '库位号',
          align: 'center',
          dataIndex: 'locationCode',
        },
         {
          title: '入库数量',
          dataIndex: 'inStorageQuantity',
src/views/tms/modules/inboundOrder/InboundOrderModel.vue
@@ -40,7 +40,7 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
          <!-- <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="库位号">
             <a-select
                :triggerChange="true"
@@ -48,7 +48,7 @@
                v-decorator="[ 'locationCodeId', validatorRules.locationCodeId ]"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <!-- <a-col :span="24 / 2">
            <a-form-item label="申请原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入申请原因"  :disabled="disableSubmit" v-decorator="['applicationReason', validatorRules.applicationReason]" />
@@ -148,6 +148,17 @@
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-select
            v-if="col.dataIndex == 'goodsShelvesId'"
            :disabled="disableSubmit"
            :triggerChange="true"
            :value="text"
            show-search
            :filter-option="filterOption"
            style="width: 100%"
            :options="locationCodeOptions"
            @change="(e) => handleChange(e, record.key, col, index)"
          />
        </div>
      </template>
      <span slot="action" slot-scope="text, record, index">
@@ -327,6 +338,12 @@
          align: 'center',
          dataIndex: 'toolModel'
        },
         {
          title: '库位号',
          align: 'center',
          dataIndex: 'goodsShelvesId',
          scopedSlots: { customRender: 'goodsShelvesId' },
        },
        {
          title: '入库数量',
          align: 'center',
@@ -353,6 +370,9 @@
  methods: {
    modalFormOk() {
    },
    filterOption(input, option) {
      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
    },
    getQueryParams() {
      this.param.pageNo = this.ipagination.current
      this.param.pageSize = this.ipagination.pageSize
src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
@@ -142,6 +142,7 @@
    },
    methods: {
      add (nodeSelected) {
        this.validatorRules.paraTypeFlag[0].required = false
        this.modelDefault.parentId = nodeSelected.key
        this.modelDefault.parentNum = nodeSelected.entity.classifyId
        this.modelDefault.parentName = nodeSelected.entity.typeName
@@ -164,7 +165,6 @@
      },
      submitForm () {
        const that = this;
        console.log("111",this.model.id)
        // 触发表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
src/views/tms/requirement/modules/ToolsModal.vue
@@ -8,7 +8,7 @@
          <a-row :gutter="24">
            <a-col :md="7" :sm="7">
              <a-form-item label="工具编码">
                <a-input placeholder="请输入工具编码检索" v-model="queryParam.equipmentid"></a-input>
                <a-input placeholder="请输入工具编码检索" v-model="queryParam.toolId"></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="3" :sm="3">