소스 검색

no message

develop
부모
커밋
844feac50d
6개의 변경된 파일298개의 추가작업 그리고 352개의 파일을 삭제
  1. +1
    -1
      public/index.html
  2. +14
    -2
      src/pages/agent/list.vue
  3. +125
    -339
      src/pages/order/detail.vue
  4. +151
    -0
      src/pages/order/orderCheck.vue
  5. +5
    -0
      src/router/config.js
  6. +2
    -10
      src/services/Common.js

+ 1
- 1
public/index.html 파일 보기

@@ -20,7 +20,7 @@
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="popContainer" class="beauty-scroll" style="height: 100vh; overflow-y: scroll;background-color: #f0f2f5;">
<div id="popContainer" class="beauty-scroll" style="height: 100vh; overflow-y: scroll;background-color: #fff;">
<div id="app"></div>
</div>
<!-- require cdn assets js -->


+ 14
- 2
src/pages/agent/list.vue 파일 보기

@@ -49,7 +49,16 @@ export default {
data(){
return{
listInput:[
{type:'input',name:'code',title:'关键词',value:'',alt:'全匹配'},
{type:'select',name:'type',title:'平台类型',value:'', width:'120px',
option:resSelects('platformType'),
},
{type:'select',name:'state',title:'状态',value:'', width:'120px',
option:[
{value:'1',text:'启用'},
{value:'2',text:'禁用'},
],
},
// {type:'input',name:'code',title:'平台类型',value:'',alt:''},
// {type:'input',name:'name',title:'商户名称',value:'',alt:'模糊匹配'},
{type:'button',name:'newAgent',title:'新增平台',value:'',alt:'',fn:this.showNEAgent},
],
@@ -159,10 +168,13 @@ export default {
}
let count = (this.pagination.current-1)*this.pagination.pageSize;
let params={
code:this.listInput[0].value,
pageIndex: this.pagination.current,
pageSize: this.pagination.pageSize
}
for (let i in this.listInput){
let ts = this.listInput[i];
if (ts.value!=='') params[ts.name] = ts.value;
}
// console.log(params)
this.fetch(params);
},


+ 125
- 339
src/pages/order/detail.vue 파일 보기

@@ -2,15 +2,15 @@
<div class="boxMain">
<a-spin :spinning="loadPage">
<div class="boxFilter bn">
<bnOrderLogList :order-id="orderId" />
<a-button type="primary" @click="fnShowOrderCheck(1)">审核订单</a-button>
<a-button v-if="isOutFactory == 1" type="primary" @click="fnShowOrderCheck(2)">复审</a-button>
<a-button v-if="!ifEdit" type="primary" :loading="loadOE" @click="BeforeOrderEdit">修改订单</a-button>
<a-button v-else @click="ifEdit=false">退出修改</a-button>
<!-- <bnOrderLogList :order-id="orderId" />-->
<a-button type="primary" @click="fnAdjustAmount">调整订单金额</a-button>
<a-button type="primary" v-if="orderStatus<70 && orderStatus>=0 && isOutFactory == 1" :loading="loadOffer" @click="fnPcbOffer">申请外发报价</a-button>
<bn-set-purchase-status :order-id="orderId" :order-status="orderDetail.orderPurchaseStatus" :getList="getOrderDetail"/>
<bnOrderCancel :order-id="orderId" />
<a-button type="primary" @click="fnShowOrderCheck(1)">审核订单</a-button>
<!-- <a-button v-if="isOutFactory == 1" type="primary" @click="fnShowOrderCheck(2)">复审</a-button>-->
<!-- <a-button v-if="!ifEdit" type="primary" :loading="loadOE" @click="BeforeOrderEdit">修改订单</a-button>-->
<!-- <a-button v-else @click="ifEdit=false">退出修改</a-button>-->
<!-- <a-button type="primary" v-if="orderStatus<70 && orderStatus>=0 && isOutFactory == 1" :loading="loadOffer" @click="fnPcbOffer">申请外发报价</a-button>-->
<!-- <bn-set-purchase-status :order-id="orderId" :order-status="orderDetail.orderPurchaseStatus" :getList="getOrderDetail"/>-->
<!-- <bnOrderCancel :order-id="orderId" />-->
</div>
<template v-if="ifEdit">
<div class="titsc"><b>修改PCB订单 No:{{orderDetail.orderNo}}</b></div>
@@ -236,244 +236,98 @@
</template>
<template v-else>
<div class="titsc"><b>基本信息</b></div>
<table class="tablesc">
<template v-if="orderDetail">
<tr>
<td class="t">订单编号</td><td class="n">{{orderDetail.orderNo}}</td>
<td class="t">订单状态</td><td class="n">{{orderDetail.orderPurchaseStatusValue}}</td>
<td class="t">包裹单号</td><td class="n">{{orderDetail.packageNo}}</td>
<td class="t">产品类型</td><td class="n">{{orderDetail.proTypeValue}}</td>
</tr>
<tr>
<td class="t">客编</td><td class="n">{{orderDetail.memberCode}}</td>
<td class="t">业务员</td><td class="n">{{orderDetail.adminName}}</td>
<td class="t">订单备注</td><td class="n">{{orderDetail.note}}</td>
<td class="t">调整金额(浮动金额)</td><td class="n">{{orderDetail.adjustmentAmount}}</td>
</tr>
<tr>
<td class="t">销售价</td><td class="n">{{orderDetail.salePrice}}</td>
<td class="t">运费</td><td class="n">{{orderDetail.shipAmount}}</td>
<td class="t">物流方式</td><td class="n">{{orderDetail.shipType}}</td>
<td class="t">调整运费</td><td class="n">{{orderDetail.adjustmentShipAmount}}</td>
</tr>
<tr>
<td class="t">总金额</td><td class="n">{{orderDetail.totalAmount}}</td>
<td class="t">实际支付金额</td><td class="n">{{orderDetail.payAmount}}</td>
<td class="t">最后支付时间</td><td class="n">{{formatDateTime(orderDetail.payTime)}}</td>
<td class="t">PCBA关联单号</td><td class="n">{{orderDetail.pcbaNo}}</td>
</tr>
<tr>
<td class="t">返单号</td><td class="n">{{orderDetail.reOrderNo}}</td>
<td class="t">根单号</td><td class="n">{{orderDetail.rootOrderNo}}</td>
<td class="t">创建时间</td><td class="n">{{formatDateTime(orderDetail.creationTime)}}</td>
<td class="t">附件列表</td>
<td class="n">
<ul class="listFiles">
<li v-for="(file,fid) in orderDetail.files" :key="fid"><a :href="file.url" target="_blank"><a-icon type="link" /> {{file.name}}</a></li>
</ul>
</td>
</tr>
<tr>
<td class="t">是否外发</td><td class="n">{{isOutFactory===0?'非外发':(isOutFactory===1?'外发':'')}}</td>
</tr>
</template>
</table>
<div class="titsc"><b>PCB信息</b></div>
<table class="tablesc">
<template v-if="pcbDetail.pcbBaseData">
<tr>
<td class="t">租户Id:</td>
<td class="n">{{pcbDetail.pcbBaseData.tenantId}}</td>
<td class="t">订单id:</td>
<td class="n">{{pcbDetail.pcbBaseData.orderId}}</td>
<td class="t">订单编号:</td>
<td class="n">{{pcbDetail.pcbBaseData.orderNo}}</td>
<td class="t">板材大类:</td>
<td class="n">{{pcbDetail.pcbBaseData.proType}}</td>
</tr>
<tr>
<td class="t">板材:</td>
<td class="n">{{pcbDetail.pcbBaseData.coreType}}</td>
<td class="t">板材tg值:</td>
<td class="n">{{pcbDetail.pcbBaseData.coreTg}}</td>
<td class="t">板材code:</td>
<td class="n">{{pcbDetail.pcbBaseData.coreTypeCode}}</td>
<td class="t">重量:</td>
<td class="n">{{pcbDetail.pcbBaseData.totalWeight}}</td>
</tr>
<tr>
<td class="t">面积:</td>
<td class="n">{{pcbDetail.pcbBaseData.boardArea}}</td>
<td class="t">板材品牌:</td>
<td class="n">{{pcbDetail.pcbBaseData.boardBrand}}</td>
<td class="t">是否为返单:</td>
<td class="n">{{pcbDetail.pcbBaseData.isReOrder}}</td>
<td class="t">返单编号:</td>
<td class="n">{{pcbDetail.pcbBaseData.reOrderNo}}</td>
</tr>
<tr>
<td class="t">交期类别:</td>
<td class="n">{{pcbDetail.pcbBaseData.deliveryType}}</td>
<td class="t">交期天数:</td>
<td class="n">{{pcbDetail.pcbBaseData.deliveryDays}}</td>
<td class="t">交期:</td>
<td class="n">{{formatDateTime(pcbDetail.pcbBaseData.deliveryDate)}}</td>
<td class="t">生产单号:</td>
<td class="n">{{pcbDetail.pcbBaseData.proOrderNo}}</td>
</tr>
</template>
<template v-if="pcbDetail.areaProcessData">
<tr>
<td class="t">宽 x 高:</td>
<td class="n">{{pcbDetail.areaProcessData.boardWidth}} x {{pcbDetail.areaProcessData.boardHeight}}</td>
<td class="t">数量:</td>
<td class="n">{{pcbDetail.areaProcessData.num}}</td>
<td class="t">pcs数:</td>
<td class="n">{{pcbDetail.areaProcessData.pcsNum}}</td>
<td class="t">set数:</td>
<td class="n">{{pcbDetail.areaProcessData.setNum}}</td>
</tr>
<tr>
<td class="t">拼版类别:</td>
<td class="n">{{pcbDetail.areaProcessData.boardType}}</td>
<td class="t">是否接受打叉板:</td>
<td class="n">{{pcbDetail.areaProcessData.acceptCrossed}}</td>
<td class="t">拼版:</td>
<td class="n">{{pcbDetail.areaProcessData.pinBanX}} x {{pcbDetail.areaProcessData.pinBanY}}</td>
<td class="t">拼版数:</td>
<td class="n">{{pcbDetail.areaProcessData.pinBanNum}}</td>
</tr>
<tr>
<td class="t">工艺边:</td>
<td class="n">{{pcbDetail.areaProcessData.processEdges}}</td>
<td class="t">工艺边宽:</td>
<td class="n">{{pcbDetail.areaProcessData.processEdgesWidth}}</td>
<td class="t">v割方式:</td>
<td class="n">{{pcbDetail.areaProcessData.vCut}}</td>
<td class="t">槽间距-高x宽:</td>
<td class="n">{{pcbDetail.areaProcessData.grooveHeight}} x {{pcbDetail.areaProcessData.grooveWidth}}</td>
</tr>
<tr>
<td class="t">单Set出货尺寸宽x高:</td>
<td class="n" colspan="7">{{pcbDetail.areaProcessData.deliverWidth}} x {{pcbDetail.areaProcessData.deliverHeight}}</td>
</tr>
</template>
<template v-if="pcbDetail.areaProcessData">
<tr>
<td class="t">是否需要阻焊:</td>
<td class="n">{{pcbDetail.personalizedProcessData.isImpedance}}</td>
<td class="t">阻焊报告:</td>
<td class="n">{{pcbDetail.personalizedProcessData.impedanceReport}}</td>
<td class="t">确认文件信息:</td>
<td class="n">{{pcbDetail.personalizedProcessData.productFileSure}}</td>
<td class="t">CAM工程师等级:</td>
<td class="n">{{pcbDetail.personalizedProcessData.camEngineer}}</td>
</tr>
<tr>
<td class="t">IPC标准等级:</td>
<td class="n">{{pcbDetail.personalizedProcessData.ipcLevel}}</td>
<td class="t">出货报告:</td>
<td class="n">{{pcbDetail.personalizedProcessData.needReportList}}</td>
<td class="t">报告材质:</td>
<td class="n">{{pcbDetail.personalizedProcessData.reportMaterial}}</td>
<td class="t">BGA数量:</td>
<td class="n">{{pcbDetail.personalizedProcessData.bgaNum}}</td>
</tr>
<tr>
<td class="t">BGA尺寸:</td>
<td class="n" colspan="7">{{pcbDetail.areaProcessData.bgaSize}}</td>
</tr>
</template>
<template v-if="pcbDetail.pcbProductionProcessData">
<tr>
<td class="t">更改料号:</td>
<td class="n">{{pcbDetail.pcbProductionProcessData.changeItemNum}}</td>
<td class="t">更改周期标识:</td>
<td class="n">{{pcbDetail.pcbProductionProcessData.changePeriod}}</td>
<td class="t">拼板利用率:</td>
<td class="n">{{pcbDetail.pcbProductionProcessData.utilizationRate}}</td>
<td class="t">沉金面积:</td>
<td class="n">{{pcbDetail.pcbProductionProcessData.immersionGoldArea}}</td>
</tr>
<tr>
<td class="t">锣程:</td>
<td class="n">{{pcbDetail.pcbProductionProcessData.routLength}}</td>
<td class="t">孔密度:</td>
<td class="n" colspan="5">{{pcbDetail.pcbProductionProcessData.boardHoleNum}}</td>
</tr>
</template>
<template v-if="pcbDetail.pcbStandardProcessData">
<tr>
<td class="t">板厚:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.boardThickness}}</td>
<td class="t">板层:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.boardLayers}}</td>
<td class="t">铜厚:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.copperThickness}}</td>
<td class="t">内层铜厚:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.innerCopperThickness}}</td>
</tr>
<tr>
<td class="t">测试方式:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.flyingProbe}}</td>
<td class="t">最小孔径:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.vias}}</td>
<td class="t">线宽线距:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.lineWeight}}</td>
<td class="t">阻焊颜色:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.solderColor}}</td>
</tr>
<tr>
<td class="t">底层阻焊颜色:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.solderColorBottom}}</td>
<td class="t">字符颜色:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.fontColor}}</td>
<td class="t">底层字符颜色:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.fontColorBottom}}</td>
<td class="t">过孔处理:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.solderCover}}</td>
</tr>
<tr>
<td class="t">线路工艺:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.imageTranster}}</td>
<td class="t">阻焊工艺:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.solderTransfer}}</td>
<td class="t">表面处理:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.surfaceFinish}}</td>
<td class="t">沉金厚度:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.imGoldThinckness}}</td>
</tr>
<tr>
<td class="t">电镀前工艺:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.beforePlating}}</td>
<td class="t">板材耐压值:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.withstandVoltage}}</td>
<td class="t">成型方式:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.formingType}}</td>
<td class="t">耐压测试:</td>
<td class="n">{{pcbDetail.pcbStandardProcessData.wvTest}}</td>
</tr>
</template>
</table>
<div class="boxKH20"></div>
<div class="titsc"><b>特殊工艺信息</b></div>
<table class="tablesa">
<tr v-for="(item,index) in pcbDetail.pcbSpecialProcessData" :key="index">
<td class="t">{{item.typeName}}</td>
<td colspan="7">{{item.typeValue}}</td>
</tr>
</table>
<template v-if="orderDetail">
<ul class="listTable">
<li><span class="t">订单编号:</span><p class="n">{{orderDetail.orderNo}}</p></li>
<li><span class="t">订单类型:</span><p class="n">{{getSelTxt('orderType',orderDetail.orderType)}}</p></li>
<li><span class="t">下单时间:</span><p class="n">{{formatDateTime(orderDetail.createTime)}}</p></li>
<li><span class="t">状态:</span><p class="n">{{getSelTxt('orderStatus',orderDetail.status)}}</p></li>
<li><span class="t">审单人员:</span><p class="n">{{orderDetail.checkAccountName}}</p></li>
<li><span class="t">业务/跟单员:</span><p class="n">/{{orderDetail.followAccount}}</p></li>
<li><span class="t">付款情况:</span><p class="n">{{orderDetail.isPay?'已支付':'未支付'}}</p></li>
</ul>
<div class="titsc"><b>参数信息</b></div>
<ul class="listTable">
<li><span class="t">尺寸(宽x高):</span><p class="n">{{orderDetail.deliverWidth}} x {{orderDetail.boardHeight}} cm</p></li>
<li><span class="t">数量:</span><p class="n">{{orderDetail.num}}</p></li>
<li><span class="t">层数:</span><p class="n">{{orderDetail.boardLayers}}</p></li>
<li><span class="t">拼版款数:</span><p class="n">{{orderDetail.pinbanNum}}</p></li>
<li><span class="t">阻焊颜色:</span><p class="n">[顶]{{orderDetail.solderColor}} [底]{{orderDetail.solderColorbottom}}</p></li>
<li><span class="t">字符:</span><p class="n">[顶]{{orderDetail.fontColor}} [底]{{orderDetail.fontColorBottom}}</p></li>
<li><span class="t">过孔处理:</span><p class="n">{{orderDetail.solderCover}}</p></li>
<li><span class="t">铜厚(内/外):</span><p class="n">{{orderDetail.innerCopperThickness+'/'+orderDetail.copperThickness}}</p></li>
<li><span class="t">过孔处理:</span><p class="n">{{orderDetail.solderCover}}</p></li>
<li><span class="t">板厚:</span><p class="n">{{orderDetail.boardThickness}} mm</p></li>
<li><span class="t">表面处理:</span><p class="n"></p></li>
<li><span class="t">孔径:</span><p class="n">{{orderDetail.vias}} mm</p></li>
<li><span class="t">线宽线距:</span><p class="n">{{orderDetail.lineWeight}}</p></li>
<li><span class="t">板材:</span><p class="n">{{orderDetail.fr4Tg}} / {{orderDetail.fr4Type}}</p></li>
<li><span class="t">出货类型:</span><p class="n">{{orderDetail.boardType}}</p></li>
<li><span class="t">是否接受打叉板:</span><p class="n"></p></li>
<li><span class="t">盲埋孔:</span><p class="n">{{orderDetail.isBlindVias}}</p></li>
<li><span class="t">BGA数量:</span><p class="n">{{orderDetail.bgaNum}}</p></li>
<li><span class="t">GBA尺寸:</span><p class="n">{{orderDetail.bgaSize}}</p></li>
<li><span class="t">金手指倒斜边:</span><p class="n">{{orderDetail.goldFinger}}</p></li>
<li><span class="t">阻抗:</span><p class="n">{{orderDetail.impedanceSize}}</p></li>
<li><span class="t">阻抗报告:</span><p class="n">{{orderDetail.impedanceReport}}</p></li>
<li><span class="t">耐压值:</span><p class="n">{{orderDetail.withstandVoltage}}</p></li>
<li><span class="t">耐压测试:</span><p class="n"></p></li>
<li><span class="t">导热系数:</span><p class="n">{{orderDetail.invoice}}</p></li>
<li><span class="t">是否加急:</span><p class="n">{{orderDetail.isJiaJi}}</p></li>
<li><span class="t">是否返单:</span><p class="n">{{orderDetail.isReorder}}</p></li>
<li><span class="t">客户文件:</span><p class="n"><a :href="orderDetail.pcbFilePath" target="_blank" :title="orderDetail.pcbFileName">{{orderDetail.pcbFileName}}</a></p></li>
<li><span class="t">测试:</span><p class="n">{{orderDetail.flyingProbe}}</p></li>
<li><span class="t">客户备注:</span><p class="n">{{orderDetail.note}}</p></li>
<li><span class="t">工程文件:</span><p class="n"></p></li>
<li><span class="t">电镀前工艺:</span><p class="n"></p></li>
<li><span class="t">V割类型:</span><p class="n">{{orderDetail.vcut}}</p></li>
<li><span class="t">自定义编号:</span><p class="n"></p></li>
<li><span class="t">成型方式:</span><p class="n">{{orderDetail.formingType}}</p></li>
<li><span class="t">半孔:</span><p class="n">{{orderDetail.halfHole}}</p></li>
<li><span class="t">出货标准:</span><p class="n">{{orderDetail.ipcLevel}}</p></li>
<li><span class="t">是否外发:</span><p class="n">{{orderDetail.isOutFactory}}</p></li>
<li><span class="t">重量:</span><p class="n"></p></li>
<li><span class="t">锣程:</span><p class="n">{{orderDetail.routLength}}</p></li>
<li><span class="t">线路工艺:</span><p class="n"></p></li>
<li><span class="t">阻焊工艺:</span><p class="n"></p></li>
<li><span class="t">孔密度:</span><p class="n">{{orderDetail.holeDensity}}</p></li>
<li><span class="t">拼版利用率:</span><p class="n"></p></li>
<li><span class="t">出货报告材质:</span><p class="n">{{orderDetail.reportMaterial}}</p></li>
<li><span class="t">出货报告:</span><p class="n">{{orderDetail.surfaceFinish}}</p></li>
<li><span class="t">是否确认生产稿:</span><p class="n"></p></li>
<li><span class="t">工程师级别:</span><p class="n">{{orderDetail.camEngineer}}</p></li>
<li><span class="t">供应商编码:</span><p class="n"></p></li>
<li><span class="t">更改周期标识:</span><p class="n"></p></li>
<li><span class="t">更改料号:</span><p class="n"></p></li>
<li><span class="t">券编号:</span><p class="n"></p></li>
<li><span class="t">审核备注:</span><p class="n"></p></li>
<li><span class="t">业务员备注:</span><p class="n">{{orderDetail.cnNote}}</p></li>
<li><span class="t">订单包备注:</span><p class="n">{{orderDetail.orderMainNote}}</p></li>
<li><span class="t">退单备注:</span><p class="n"></p></li>
</ul>
</template>
<!-- <div class="boxKH20"></div>-->
<!-- <div class="titsc"><b>特殊工艺信息</b></div>-->
<!-- <table class="tablesa">-->
<!-- <tr v-for="(item,index) in pcbDetail.pcbSpecialProcessData" :key="index">-->
<!-- <td class="t">{{item.typeName}}</td>-->
<!-- <td colspan="7">{{item.typeValue}}</td>-->
<!-- </tr>-->
<!-- </table>-->
</template>
</a-spin>
<a-modal :title="formOrderCheck.OCType===1?'审核订单':'复审订单'" :visible="showOrderCheck" :confirm-loading="confirmSubmit" @ok="fnOrderCheck" @cancel="showOrderCheck=false">
<a-form-model v-model="formOrderCheck" v-bind="layout">
<a-form-model-item label="审核操作">
<a-radio-group v-model="formOrderCheck.isPass">
<a-radio :value="1">审核通过</a-radio>
<a-radio :value="0">审核不通过驳回</a-radio>
<a-modal title="审核订单" :visible="showOC" :confirm-loading="confirmSubmit" @ok="$refs.formOC.fnOrderCheck()" @cancel="showOC = false" width="700px">
<orderCheck :isAlt="true" :orderInfo="orderDetail" :orderId="orderId" ref="formOC"></orderCheck>
</a-modal>
<a-modal title="调整价格" :visible="showSetOrderMoney" :confirm-loading="confirmSubmit" @ok="fnSetOrderMoney" @cancel="showSetOrderMoney=false" width="700px">
<a-form-model v-model="formOrderMoney" v-bind="layout">
<a-form-model-item label="是否加急">
<a-radio-group v-model="formOrderMoney.isPass">
<a-radio :value="0">不加急</a-radio>
<a-radio :value="1">加急</a-radio>
</a-radio-group>
</a-form-model-item>
<!-- <a-form-model-item label="备注"><a-textarea v-model="formOrderCheck.remark" placeholder="" :rows="3" /></a-form-model-item>-->
<a-form-model-item label="调价备注"><a-textarea v-model="formOrderMoney.remark" placeholder="" :rows="3" /></a-form-model-item>
</a-form-model>
</a-modal>
</div>
@@ -481,89 +335,32 @@

<script>
import {
OrderPcbDetail,
OrderPcbCheck,
QuotePcbProcessType,
OrderPcbEditDetail,
putOrderPcb,
OrderPcbOffer
OrderPcbOffer, OrderDetail,OrderParamDetail
} from "@/services/order/Order";
import {formatDate} from "@/services/Common";
import bnOrderLogList from "@/pages/Common/bnOrderLogList";
import bnOrderCancel from "@/pages/Common/bnOrderCancel";
import BnSetPurchaseStatus from "@/pages/Common/bnSetPurchaseStatus";
import {formatDate, resSelects} from "@/services/Common";
import orderCheck from "@/pages/order/orderCheck";
// import bnOrderLogList from "@/pages/Common/bnOrderLogList";
// import bnOrderCancel from "@/pages/Common/bnOrderCancel";
// import BnSetPurchaseStatus from "@/pages/Common/bnSetPurchaseStatus";

export default {
name: 'PcbDetail',
components: {bnOrderLogList,bnOrderCancel,BnSetPurchaseStatus},
components: {orderCheck},
// components: {bnOrderLogList,bnOrderCancel,BnSetPurchaseStatus},
data(){
return{
loadPage:true,showOrderCheck:false,confirmSubmit:false,loadOE:false,ifEdit:false,loadEdit:false,loadOffer:false,
loadPage:true,confirmSubmit:false,loadOE:false,ifEdit:false,loadEdit:false,loadOffer:false,
orderId:'',orderStatus:0,orderDetail:{},pcbDetail:{},isOutFactory:'',
formOrderCheck:{orderId:'',isPass:1,remark:'',OCType:''},
layout: {
labelCol: { span:7 },
wrapperCol: { span:15 },
},
layout:{labelCol:{span:5},wrapperCol:{span:19},},
formPQ:{},typeList:{},arrSpecialList:[],selSL:[],
formOrderMoney:{},
showOC:false,formOC:{},
PcbProcessType:{},

// formPQ:{
// orderId:'',
// boardWidth:0,
// boardHeight:0,
// boardThickness:0,
// boardLayers:0,
// num:0,
// solderColor:'',
// solderColorBottom:'',
// fontColor:'',
// fontColorBottom:'',
// solderCover:'',
// pinBanX:0,
// pinBanY:0,
// pinBanNum:0,
// processEdges:'',
// processEdgesWidth:0,
// vCut:'',
// grooveHeight:0,
// grooveWidth:0,
// copperThickness:0,
// innerCopperThickness:0,
// surfaceFinish:'',
// flyingProbe:'',
// vias:0,
// lineWeight:'',
// coreType:'',
// coreTg:'',
// boardType:'',
// acceptCrossed:'',
// bgaNum:0,
// bgaSize:0,
// imGoldThinckness:0,
// impedanceReport:0,
// isImpedance:0,
// boardHoleNum:0,
// ipcLevel:0,
// needReportList:'',
// productFileSure:0,
// camEngineer:0,
// aluminumType:'',
// withstandVoltage:'',
// formingType:'',
// routLength:0,
// beforePlating:'',
// changeItemNum:0,
// changePeriod:0,
// imageTranster:'',
// utilizationRate:0,
// solderTransfer:'',
// wvTest:'',
// halfHole:0,
// reportMaterial:0,
// Note:'',
// SpecialProcess:[],
// }
showSetOrderMoney:false,
}
},
mounted() {
@@ -571,36 +368,16 @@ export default {
this.getOrderDetail();
},
methods:{
fnShowOrderCheck(key){
this.showOC = true;
},
async getOrderDetail(){
this.loadPage = true;
let res = await OrderPcbDetail(this.orderId);
this.pcbDetail = res.pcbDetail;
this.isOutFactory = res.pcbDetail.pcbBaseData.isOutFactory;
this.orderDetail = res.orderDetail;
this.orderStatus = res.orderDetail.orderPurchaseStatus;
let res = await OrderDetail(this.orderId);
let resOP = await OrderParamDetail(this.orderId);
this.orderDetail = res.data;
this.loadPage = false;
},
formatDateTime(time){
return formatDate(time,'yyyy-MM-dd hh:mm');
},
fnShowOrderCheck(key){
this.formOrderCheck.OCType = key;
this.showOrderCheck = true;
},
//审核订单
fnOrderCheck(){
this.confirmSubmit = true;
this.formOrderCheck.orderId = this.orderId;
OrderPcbCheck(this.formOrderCheck).then(res=>{
this.$message.success('设置成功!');
this.showOrderCheck = false;
this.confirmSubmit = false;
this.getOrderDetail()
}).catch(err=>{
this.confirmSubmit = false;
});

},
//修改订单
async BeforeOrderEdit(){
this.loadOE = true;
@@ -771,7 +548,16 @@ export default {
return arr;
}
}
}
},
getSelTxt(type,key){
return resSelects(type,key===0?key:key||'null');
},
formatDateTime(time){
return formatDate(time,'yyyy-MM-dd hh:mm');
},
fnSetOrderMoney(){

},
}
}
</script>


+ 151
- 0
src/pages/order/orderCheck.vue 파일 보기

@@ -0,0 +1,151 @@
<template>
<a-spin :spinning="loadPage">
<a-form-model :model="form" :rules="rules" v-bind="layout" ref="ruleForm" :class="{isNAlt:!isAlt}">
<a-form-model-item label="审核操作" prop="statue">
<a-radio-group v-model="form.statue">
<a-radio :value="1">审核通过</a-radio>
<a-radio :value="2">审核不通过驳回</a-radio>
<a-radio :value="3" v-if="isST24">设置为外发</a-radio>
</a-radio-group>
</a-form-model-item>
<a-form-model-item label="问题类型" prop="type">
<a-radio-group v-model="form.type">
<a-radio :value="1">EQ</a-radio>
<a-radio :value="2">工艺</a-radio>
<a-radio :value="3">价格</a-radio>
<a-radio :value="4">交期</a-radio>
<a-radio :value="5">操作</a-radio>
<a-radio :value="6">其他</a-radio>
</a-radio-group>
</a-form-model-item>
<a-form-model-item label="备注类型" v-if="isST24">
<a-radio-group v-model="form.contentType">
<a-radio :value="1">客户备注附加</a-radio>
<a-radio :value="2">订单包备注附加</a-radio>
<a-radio :value="3">客户标签备注附加</a-radio>
</a-radio-group>
</a-form-model-item>
<a-form-model-item label="备注说明">
<quill-editor :options="editorOption" ref="myTextEditor" v-model="form.content"></quill-editor>
</a-form-model-item>
</a-form-model>
<div class="bn" v-if="!isAltN">
<a-button type="primary" @click="fnOrderCheck">确定</a-button>
</div>
</a-spin>
</template>

<script>
import {OrderDetail, OrderCheck} from "@/services/order/Order";
import "quill/dist/quill.core.css";
import "quill/dist/quill.snow.css";
import "quill/dist/quill.bubble.css";
import { quillEditor } from "vue-quill-editor";

export default {
name: "reviewOrder",
components: {
quillEditor
},
props:['isAlt','hidden','orderId','orderInfo'],
data(){
return{
confirmSubmit:false,resFormTimes:'',isST24:false,
form:{orderId:'',sourceType:'',statue:'',type:'',contentType:null,content:''},
layout:{labelCol:{span:5},wrapperCol:{span:18},},
isAltN:false,loadPage:false,
rules:{
statue: [{ required: true, message: '请选择审核结果!', trigger: 'change' }],
type: [{ required: true, message: '请选择问题类型!', trigger: 'change' }],
},
editorOption:{
modules: {
toolbar: [
['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
// ['blockquote', 'code-block'], // 引用 代码块
// [{ header: 1 }, { header: 2 }], // 1、2 级标题
// [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
// [{ script: 'sub' }, { script: 'super' }], // 上标/下标
// [{ indent: '-1' }, { indent: '+1' }], // 缩进
// [{ direction: 'rtl' }], // 文本方向
// [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
[{ header: [1, 2, 3, 4, 5, 6] }], // 标题
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
// [{ font: ['songti'] }], // 字体种类
[{ align: [] }], // 对齐方式
['clean'], // 清除文本格式
['image'] // 链接、图片、视频
]
},
placeholder: '请输入正文'
}
}
},
// watch:{
// resFormTimes(val){
// }
// },
mounted() {
this.isAltN = typeof this.isAlt !== 'undefined';
if (typeof this.orderId==='undefined') {
this.form.orderId = this.$route.query.id;
this.getOrderDetail();
}
else{
this.form.orderId = this.orderId;
this.form.sourceType = this.orderInfo?.sourceType;
}
this.fnIsST24();
},
methods:{
//审核订单
fnOrderCheck(){
this.$refs.ruleForm.validate(valid => {
if (valid) {
console.log(1,this.isST24)
if (this.isST24 && (this.form.contentType===0 || this.form.contentType==='')){
this.$message.warn('请选择备注类型')
return false;
}
this.loadPage = true;
OrderCheck(this.form).then(res=>{
if (res.success) this.$message.success(res.message);
else this.$message.error(res.message);
}).finally(()=>{
this.loadPage = false;
});
}else return false;
});
},
//订单详情
async getOrderDetail(){
this.loadPage = true;
if (!this.form.orderId){
this.errOrderInfo()
return false;
}
let res = await OrderDetail(this.form.orderId);
if (res.success){
let db = res.data;
this.form.sourceType = db.sourceType;
this.loadPage = false;
}else this.errOrderInfo();
// console.log(this.form)
},
errOrderInfo(){
this.$message.error('订单信息错误!');
this.loadPage = true;
},
fnIsST24(){
this.isST24 = this.form.sourceType !== '4' && this.form.sourceType !== '2';
}
}
}
</script>

<style scoped>
.ant-form.isNAlt{padding:30px 0 0;}
.bn{text-align:center; clear:both}
/deep/ .ql-editor{height:220px}
/deep/ .ql-toolbar.ql-snow{padding:3px 8px; line-height:24px}
</style>

+ 5
- 0
src/router/config.js 파일 보기

@@ -26,6 +26,11 @@ const options = {
component: () => import('@/pages/exception/403'),
},
{
path: '/orderCheck',
name: '审核订单',
component: () => import('@/pages/order/orderCheck'),
},
{
path: '/account',
name: '帐号管理',
component: TabsView,


+ 2
- 10
src/services/Common.js 파일 보기

@@ -62,7 +62,7 @@ function padLeftZero (str) {
//订单类型:orderType
//订单状态:orderStatus
//解析状态:parseStatue
//平台类别:platformType
//订单来源/平台类别:sourceType/platformType
export function resSelects(type='',val=''){
// console.log(type,val)
let list = [];
@@ -72,7 +72,7 @@ export function resSelects(type='',val=''){
{value:'1',text:'打样'},
]
}
else if (type==='sourceType'){
else if (type==='sourceType' || type==='platformType'){
list = [
{value:'0',text:'内贸'},
{value:'1',text:'外贸'},
@@ -98,14 +98,6 @@ export function resSelects(type='',val=''){
{value:'3',text:'解析失败'},
]
}
else if (type==='platformType'){
list = [
{value:'1',text:'内贸'},
{value:'2',text:'外贸'},
{value:'3',text:'调度平台'},
{value:'4',text:'精密铝基板'},
]
}
else return false;
//返回内容
if(val!==''){


불러오는 중...
취소
저장