Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-12-21 51ec0fbe59a3c7768996072874ea6f0c2b91c060

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/api/quality/Packaging_ledger.js

@@ -18,12 +18,19 @@

export function list(query) {
    return request({
      url: '/mes//qualityPackageBoxDetail/list',
      url: '/mes/qualityPackageBoxDetail/list',
      method: 'get',
      params: query
    })
}

export function selById(query) {
  return request({
    url: '/mes/qualityPackageBox/selById',
    method: 'get',
    params: query
  })
}
export function customerpage(query) {
    return request({
      url: '/mes/customer/page',

 src/const/website.js

@@ -3,8 +3,8 @@
  copyright: 'Copyright Â© 2021 chinaztt.com. All rights reserved.',
  isFirstPage: true, // é…ç½®é¦–页不可关闭
  key: 'ztt', // é…ç½®ä¸»é”®,目前用于存储
  whiteList: ['/login', '/404', '/401', '/lock'], // é…ç½®æ— æƒé™å¯ä»¥è®¿é—®çš„页面
  whiteTagList: ['/login', '/404', '/401', '/lock'], // é…ç½®ä¸æ·»åŠ tags页面 ï¼ˆ'/advanced-router/mutative-detail/*'——*为通配符）
  whiteList: ['/login', '/404', '/401', '/lock','/pack'], // é…ç½®æ— æƒé™å¯ä»¥è®¿é—®çš„页面
  whiteTagList: ['/login', '/404', '/401', '/lock','/pack'], // é…ç½®ä¸æ·»åŠ tags页面 ï¼ˆ'/advanced-router/mutative-detail/*'——*为通配符）
  fistPage: {
    label: '首页',
    value: '/wel/index',

 src/page/PackingLedgerDetails/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
<template>
    <div >
        <el-card class="box-card" v-for="(el,item) in testStandardParams" >
            <div>
                <el-form  :model="el" label-width="80px">
                    <el-form-item label="序号:">
                        {{ item + 1  }}
                    </el-form-item>
                </el-form>
                <el-form  :model="el" label-width="80px">
                    <el-form-item label="产品:">
                        {{ el.product }}
                    </el-form-item>
                </el-form>
                <el-form  :model="el" label-width="80px">
                    <el-form-item label="产品编号：">
                        {{ el.productNo }}
                    </el-form-item>
                </el-form>
                <el-form  :model="el" label-width="80px">
                    <el-form-item label="批次号：">
                        {{ el.outBatchNo }}
                    </el-form-item>
                </el-form>
                <el-form  :model="el" label-width="80px">
                    <el-form-item label="规格型号：">
                        {{ el.specs }}
                    </el-form-item>
                </el-form>
                <el-form  :model="el" label-width="80px">
                    <el-form-item label="单位：">
                        {{ el.unit }}
                    </el-form-item>
                </el-form>
                <el-form  :model="el" label-width="80px">
                    <el-form-item label="数量：">
                        {{ el.number }}
                    </el-form-item>
                </el-form>
            </div>
        </el-card>
    </div>
</template>

<script>
import {selById} from '@/api/quality/Packaging_ledger'

export default{
    data(){
        return{
            testStandardParams:[]
        }
    },
    created() {
        let aa = this.$route.query
        console.log(this.$route.query,"id");
        this.chuaxun(aa)
    },
    methods: {
        chuaxun(aa){
            selById({id:aa.id}).then((res) =>{
          this.testStandardParams = res.data.data
        })
      },
    }
}

</script>

<style>
.box-card{
    margin: 20px;
    border-radius: 40px;
}
.inputDeep {

}
</style>

 src/permission.js

@@ -12,6 +12,7 @@
router.beforeEach((to, from, next) => {
  NProgress.start();
  const meta = to.meta || {};
  const whiteList = ['/login', '/404', '/401', '/lock','/pack']
  if (store.getters.access_token) {
    if (store.getters.isLock && to.path !== '/lock') {
      next({ path: '/lock' });
@@ -35,7 +36,15 @@
    // é¡µé¢å¤šå¼€ï¼šè½½å…¥localStorage的auth参数 By Luxn
    let auth = JSON.parse(localStorage.getItem("authorization") || "{}");
    if ( meta.isAuth === false) {
      next();
      //没有token的情况
    if (whiteList.indexOf(to.path) !== -1) {
      // å¦‚果在白名单内则直接跳转
      next()
    } else {
      // å…¶ä½™é¡µé¢é‡å®šå‘到登录页
      next('/login')
    }
      // next();
    }else{
      if (auth.date_time) {
        let key = ["access_token", "refresh_token", "expires_in", "user_info", "language"];
@@ -57,7 +66,6 @@
      }else{
        next('/login');
      }

    }
  }
})

 src/router/page/index.js

@@ -2,6 +2,16 @@

export default [
  {
    path: '/pack',
    name: '包装详情',
    component: () => import(/* webpackChunkName: "page" */ '@/page/PackingLedgerDetails/index'),
    meta: {
      keepAlive: true,
      isTab: false,
      isAuth: false
    }
  },
  {
    path: '/thirdpartylogin',
    name: '第三方登录页',
    component: () =>

 src/views/plan/manufacturingorder/index.vue

@@ -201,7 +201,7 @@
      </el-dialog>
    </basic-container>
    <!-- æ ‡ç­¾æ‰“印 -->
    <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px" top="5vh">
    <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="28%" top="5vh">
      <div style="width:100%;height: 400px;overflow-y: auto;">
        <div class="dia_body">
          <el-checkbox 
@@ -234,26 +234,28 @@
                      <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                    </el-col>
                  </el-row> -->
                   <div style="display: flex;">
                   <div>
                    <el-row style="font-size: 14px;padding-left: 20px;">
                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
                    </el-row>
                    <div style="display: flex;">
                      <div>
                        <el-col :span="8" :offset="2">
                        <el-col :span="8" :offset="4">
                          <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
                        </el-col>
                      </div>
                      <div style="margin-left: 20px;width: 100%;">
                        <el-row >
                          <el-col  style="font-weight: bold;"><span>批次号:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
                      <div style="margin-left: 50px;width: 100%;">
                        <el-row style="margin-top: 10px;">
                          <el-col  style="font-weight: bold;font-size: 14px;"><span>批&nbsp; æ¬¡&nbsp;号:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;"><span>订单号:&nbsp; </span>{{ item.orderNo }}</el-col>
                        <el-row style="margin-top: 9px;font-size: 14px;">
                          <el-col  style="font-weight: bold;"><span>订&nbsp; å•&nbsp;号:&nbsp; </span>{{ item.orderNo }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                        <el-row style="margin-top: 9px;font-size: 14px;">
                          <el-col  style="font-weight: bold;"><span>客户名称:&nbsp; </span>{{ item.cName }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
                        </el-row>
                      </div>
                  </div>
                  </div>
            </el-card>
          </el-checkbox-group>
@@ -267,7 +269,7 @@
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
            <el-row style="font-size:12px;">
            <!-- <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">批次号</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
            </el-row>
@@ -288,7 +290,28 @@
              <el-col :span="10">
                <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
              </el-col>
            </el-row>
            </el-row> -->
            <el-row style="font-size: 14px;padding-left: 20px;">
                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
                    </el-row>
                    <div style="display: flex;">
                      <div>
                        <el-col :span="8" :offset="4">
                          <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
                        </el-col>
                      </div>
                      <div style="margin-left: 50px;width: 100%;">
                        <el-row style="margin-top: 10px;">
                          <el-col  style="font-weight: bold;font-size: 14px;"><span>批&nbsp; æ¬¡&nbsp;号:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 9px;font-size: 14px;">
                          <el-col  style="font-weight: bold;"><span>订&nbsp; å•&nbsp;号:&nbsp; </span>{{ item.orderNo }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 9px;font-size: 14px;">
                          <el-col  style="font-weight: bold;"><span>客户名称:&nbsp; </span>{{ item.cName }}</el-col>
                        </el-row>
                      </div>
                    </div>
          </el-card>
        </div>
      </div>

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -65,6 +65,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="零件" prop="partId">
                <el-tooltip class="item" effect="dark" :content="partStr" >
                <el-input v-model="partStr" placeholder="" readonly>
                  <el-button
                    v-if="!this.dataForm.id"
@@ -73,6 +74,7 @@
                    @click="openRoutingDialog()"
                  ></el-button>
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>

 src/views/plan/operationtask/operationtask-form.vue

@@ -145,7 +145,7 @@
                          </el-select>
                        </el-form-item>
                      </el-col>
                      <el-col :span="7">
                      <el-col :span="10">
                        <el-form-item label="工作中心" prop="workCenter">
                          <el-select v-model="dataForm.workCenter" :disabled="!editable" filterable placeholder="请选择工作中心"
                            style="width:100%" @change="changeWorkCenter">
@@ -153,6 +153,16 @@
                              :key="index">
                            </el-option>
                          </el-select>
                        </el-form-item>
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <el-col :span="15">
                        <el-form-item label="计划时间" prop="localDateTimes">
                          <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
                            type="datetimerange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
                            value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
                          </el-date-picker>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
@@ -167,39 +177,36 @@
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <el-col :span="14">
                        <el-form-item label="计划时间" prop="localDateTimes">
                          <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
                            type="datetimerange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
                            value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
                          </el-date-picker>
                        </el-form-item>
                      </el-col>
                      <el-col :span="10">
                        <el-form-item label="计划数量" prop="plannedQuantity">
                          <el-input v-model="dataForm.plannedQuantity" :disabled="!editable" placeholder="计划数量"
                            style="width:calc(100% - 30px)"></el-input>
                          <span>{{ dataForm.unit }}</span>
                        </el-form-item>
                      </el-col></el-row>
                    <el-row :gutter="10">
                      <el-col :span="12">
                        <el-form-item label="零件" prop="partName">
                          <el-input v-model="dataForm.partName" placeholder="零件" disabled></el-input>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
                        <el-form-item label="零件号" prop="partNo">
                          <el-input v-model="dataForm.partNo" placeholder="零件号" disabled></el-input>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
                      <el-col :span="10">
                        <el-form-item label="工单所需时间" prop="taskTheoreticalTime">
                          <el-input v-model="dataForm.taskTheoreticalTime" placeholder="工单所需时间"
                            style="width:calc(100% - 30px)"></el-input>
                          <span>min</span>
                        </el-form-item>
                      </el-col>
                      </el-row>
                    <el-row :gutter="10">
                      <el-col :span="12">
                        <el-form-item label="零件" prop="partName">
                          <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                          <el-input v-model="dataForm.partName" placeholder="零件" disabled></el-input>
                          </el-tooltip>
                        </el-form-item>
                      </el-col>
                      <el-col :span="10">
                        <el-form-item label="零件号" prop="partNo">
                          <el-tooltip class="item" effect="dark" :content="dataForm.partNo" >
                          <el-input v-model="dataForm.partNo" placeholder="零件号" disabled></el-input>
                          </el-tooltip>
                        </el-form-item>
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <span style="float:right; margin-right:30px; margin-top: 55px">

 src/views/quality/Packaging_ledger/index.vue

@@ -150,7 +150,7 @@
              <el-row>
                <el-col :span="10" :offset="3">包装台账二维码：</el-col>
                <el-col :span="10">
                  <vueQr :text="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
                  <vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
                </el-col>
              </el-row>
            </el-card>
@@ -174,6 +174,7 @@
export default {
    data(){
        return {
          str:"http://192.168.2.213:8080/#/pack?id=",
          qrData:[],
          diaPrintTab: false,
          multipleSelection: [],
@@ -348,6 +349,7 @@
      },
      handleSelectionChange(val){
        this.multipleSelection = val
        console.log(this.multipleSelection[0].id,"数据");
        let lastRow = val[val.length - 1]
        this.handleCurrentChange(lastRow)
      },

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -48,12 +48,14 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="产品名称：">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
                                <el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="(item,index) in optionsSamplename" :key="index" :label="item.material"
                                        :value="item.materialCode">
                                    </el-option>
                                </el-select>
                                </el-tooltip>
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
@@ -63,7 +65,9 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="规格型号：">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.specificationsModel">
                                <el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
                                </el-tooltip>
                            </el-form-item>
                        </el-col>
                    </el-row>

 src/views/quality/processInspect/processInspect-form.vue

@@ -31,6 +31,7 @@
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="产品名称：">
                                    <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
                                    <el-select style="width: 100%" @change="changeOptionsSamplename"
                                        :disabled="processInspectVo.id != null" v-model="processInspectVo.material"
                                        size="small" placeholder="请选择产品名称">
@@ -38,6 +39,7 @@
                                            :label="item.material" :value="item.materialCode">
                                        </el-option>
                                    </el-select>
                                    </el-tooltip>
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
@@ -50,8 +52,10 @@
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="规格型号：">
                                    <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
                                    <el-input disabled v-model="processInspectVo.specs" 
                                        autocomplete="off" />
                                    </el-tooltip>
                                </el-form-item>
                            </el-col>
                        

 src/views/quality/teststandard/index.vue

@@ -321,7 +321,7 @@
      isShowQuery: false,
      uploadInfo: {
        // æ˜¯å¦å±•ç¤ºä¸Šä¼ EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/testStandard/upload'
      },
      prelang: 'operation',

 vue.config.js

@@ -4,15 +4,10 @@
 */


// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'

const url = 'http://localhost:9999'
// const url = 'http://localhost:9999'


const localUrl = 'http://localhost:8089'