guoyuji
2024-03-27 f1c7702e9fd1aa235523de9767bc96d1838e104f
打包后刷新界面获取不到本地地址问题,工艺审核界面商标打印展示
4个文件已修改
257 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/router/index.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue 242 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/router/index.js
@@ -1,8 +1,9 @@
import { createRouter, createWebHistory } from 'vue-router'
import {createRouter, createWebHashHistory, createWebHistory} from 'vue-router'
import HomeView from '../views/HomeView.vue'
const router = createRouter({
  history: createWebHistory(import.meta.env.BASE_URL),
  history: createWebHashHistory(),
  //history: createWebHistory(import.meta.env.BASE_URL),
  routes: [
    {
      path: '/',
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -493,6 +493,7 @@
  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    //进入页面下拉框设置默认值
    titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
    titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
    titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
@@ -530,7 +531,12 @@
  request.post(`/order/updateOrderMoney`,updateData).then(res => {
    if (res.code == 200){
      ElMessage.success( t('order.msg.updateAmountSuccessfully') )
      router.push({path:'/main/order/createOrder',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
      router.push({path:'/main/order/createOrder',
        query:{
          orderId:titleUploadData.value.orderId,
          random:Math.random()
        }
      })
    }
  })
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -279,7 +279,7 @@
        break
      }
      case 'delete': {
        if (row.processReview === 2) {
        if (Math.abs(row.processReview) === 2) {
          ElMessage.warning(t('searchOrder.msgDelete'))
          return
        }
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -6,6 +6,7 @@
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import {useI18n} from "vue-i18n"
import {Flag, Location} from "@element-plus/icons-vue";
const { t } = useI18n()
const router = useRouter()
@@ -337,6 +338,17 @@
    }
  })
}
const tagCheck =  (state) => {
  if(typeof trademarkAttr.value.location === 'string'){
    return false
  }
  const filterArr = trademarkAttr.value.location.filter((item) =>{
    return item === state
  })
  return filterArr.length > 0
}
</script>
<template>
@@ -450,95 +462,165 @@
        :title="'商标参数'"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
        style="width: 60%;height:60% ;
        style="width: 922px;height:443px ;
        position: relative;" >
      <el-row>
        <el-col :span="2">商标选项:</el-col>
        <el-col :span="3">
          <el-select v-model="trademarkAttr.trademark"
                      >
            <el-option :value="item.basicName" v-for="item in trademarkList" />
          </el-select>
        </el-col>
      </el-row>
      <div style="width: 50%;height: 100%;float: left">
        <el-row style="">
          <el-col :span="4">商标选项:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.trademark"
                        >
              <el-option :value="item.basicName" v-for="item in trademarkList" />
            </el-select>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">X轴镜像:</el-col>
        <el-col :span="3">
          <el-select v-model="trademarkAttr.xImage">
            <el-option :value="true"/>
            <el-option :value="false"/>
          </el-select>
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">X轴镜像:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.xImage">
              <el-option :value="true" :label="'是'"/>
              <el-option :value="false" :label="'否'"/>
            </el-select>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">Y轴镜像:</el-col>
        <el-col :span="3">
          <el-select v-model="trademarkAttr.yImage">
            <el-option :value="true"/>
            <el-option :value="false"/>
          </el-select>
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">Y轴镜像:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.yImage">
              <el-option :value="true" :label="'是'"/>
              <el-option :value="false" :label="'否'"/>
            </el-select>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">打标使能:</el-col>
        <el-col :span="3">
          <el-select v-model="trademarkAttr.tag">
            <el-option :value="true"/>
            <el-option :value="false"/>
          </el-select>
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">打标使能:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.tag">
              <el-option :value="true" :label="'是'"/>
              <el-option :value="false" :label="'否'"/>
            </el-select>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">标签2使能:</el-col>
        <el-col :span="3">
          <el-select v-model="trademarkAttr.tag2">
            <el-option :value="true"/>
            <el-option :value="false"/>
          </el-select>
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">二维码打印:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.tag2">
              <el-option :value="true" :label="'是'"/>
              <el-option :value="false" :label="'否'"/>
            </el-select>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">标签3使能:</el-col>
        <el-col :span="3">
          <el-select v-model="trademarkAttr.tag3">
            <el-option :value="true"/>
            <el-option :value="false"/>
          </el-select>
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">标签3使能:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.tag3">
              <el-option :value="true" :label="'是'"/>
              <el-option :value="false" :label="'否'"/>
            </el-select>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">X轴边距:</el-col>
        <el-col :span="3">
          <el-input-number v-model="trademarkAttr.xMargin"/>
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">X轴边距:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.xMargin"/>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">Y轴边距:</el-col>
        <el-col :span="3">
          <el-input-number v-model="trademarkAttr.yMargin"/>
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">Y轴边距:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.yMargin"/>
          </el-col>
        </el-row>
      <el-row>
        <el-col :span="2">商标位置:</el-col>
        <el-col :span="8">
          <el-checkbox v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item"  />
        </el-col>
      </el-row>
        <el-row>
          <el-col :span="4">商标位置:</el-col>
          <el-col :span="16">
            <el-checkbox v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item"  />
          </el-col>
        </el-row>
      <el-row>
        <el-col >
          <el-button @click="changeTrademark" style="float:right;" type="primary" >{{$t('craft.sure')}}</el-button>
          <el-button  style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
        </el-col>
      </el-row>
        <el-row>
          <el-col >
            <el-button @click="changeTrademark" style="float:right;" type="primary" >{{$t('craft.sure')}}</el-button>
            <el-button  style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
          </el-col>
        </el-row>
      </div>
      <div style="width: 400px;height: 250px;border: 2px solid #000;float: left;position: relative;">
        <div
            v-if="tagCheck('左上')"
            style="float: left;width: 60px;height: 60px;margin-left: 1rem">
          <el-row>
            <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >X:</el-col>
            <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >Y:</el-col>
            <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
          </el-row>
        </div>
        <div
            v-if="tagCheck('右上')"
            style="float: right;width: 60px;height: 60px;margin-right: 1rem">
          <el-row>
            <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >X:</el-col>
            <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >Y:</el-col>
            <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
          </el-row>
        </div>
        <div
            v-if="tagCheck('左下')"
            style="width: 60px;height: 60px;margin-left: 1rem;float: left;position: absolute;bottom: 8px">
          <el-row>
            <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >X:</el-col>
            <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >Y:</el-col>
            <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
          </el-row>
        </div>
        <div
            v-if="tagCheck('右下')"
            style="width: 60px;height: 60px;position: absolute;bottom: 8px;right: 1rem">
          <el-row>
            <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >X:</el-col>
            <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
          </el-row>
          <el-row >
            <el-col :span="5" >Y:</el-col>
            <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
          </el-row>
        </div>
      </div>
    </el-dialog>
  </div>
@@ -558,7 +640,7 @@
}
.order-detail{
  width: 100%;
  height: 90%;
  height: 85%;
}
#trademark .el-row,#trademark .el-col{
  border: 0