no message

.env.test

@@ -1,8 +1,8 @@
 NODE_ENV=production
 
 # api服务的baseUrls
-VUE_APP_API_IDS=http://192.168.19.4:44330
-VUE_APP_API_BASE_URL_API=http://192.168.19.4:44332
+VUE_APP_API_IDS=/ids
+VUE_APP_API_BASE_URL_API=/
 
 
 VUE_APP_YFZX_CSZ=de89fee0-d722-9d95-9520-3a00f6ff7b35

src/pages/order/detail.vue

@@ -3,14 +3,14 @@
     <a-spin :spinning="loadPage">
       <div class="boxFilter bn">
 <!--        <bnOrderLogList :order-id="orderId" />-->
-        <a-button type="primary" @click="fnAdjustAmount">调整订单金额</a-button>
+        <a-button type="primary" @click="fnShowOrderMoney">调整订单金额</a-button>
         <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" />-->
+        <!--<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>
@@ -315,50 +315,39 @@
             </template>
           </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>-->
+        <!--<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="审核订单" :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="formOrderMoney.remark" placeholder="" :rows="3" /></a-form-model-item>
-      </a-form-model>
-    </a-modal>
+    <orderMoney :showAlt="showSetOrderMoney" :fnHiddenAlt="fnHideOrderMoney" :sourceType="orderDetail.sourceType" :orderId="orderId" ref="formMoney"></orderMoney>
   </div>
 </template>
 
 <script>
 import {
-  OrderPcbCheck,
   QuotePcbProcessType,
   OrderPcbEditDetail,
-  putOrderPcb,
-  OrderPcbOffer, OrderDetail,OrderParamDetail
+  putOrderPcb, OrderDetail,OrderParamDetail
 } from "@/services/order/Order";
 import {formatDate, resSelects} from "@/services/Common";
 import orderCheck from "@/pages/order/orderCheck";
+import orderMoney from "@/pages/order/orderMoney";
 // import bnOrderLogList from "@/pages/Common/bnOrderLogList";
 // import bnOrderCancel from "@/pages/Common/bnOrderCancel";
 // import BnSetPurchaseStatus from "@/pages/Common/bnSetPurchaseStatus";
 
 export default {
   name: 'PcbDetail',
-  components: {orderCheck},
+  components: {orderCheck,orderMoney},
   // components: {bnOrderLogList,bnOrderCancel,BnSetPurchaseStatus},
   data(){
     return{
@@ -1151,21 +1140,18 @@ export default {
         this.loadEdit = false;
       })
     },
-    //申请外发报价
-    async fnPcbOffer(){
-      this.loadOffer = true;
-      try{
-        await OrderPcbOffer(this.orderId)
-        this.$message.success('提交成功！');
-      }catch (e) {
-        console.log(e);
-      }finally {
-        this.loadOffer = false;
-      }
+    //隐藏调整价格
+    fnHideOrderMoney(){
+      this.showSetOrderMoney = false;
     },
     //调整价格
-    fnAdjustAmount(){
-      this.$message.warning('emmm.. 暂不支持调价！');
+    fnShowOrderMoney(){
+      // this.$message.warning('emmm.. 暂不支持调价！');
+      this.showSetOrderMoney = true;
+      // let that = this;
+      // setTimeout(function () {
+      //   that.$refs.formMoney.fnGetOrderMoney();
+      // },500);
     },
     //参数获取返回解析
     resEditPP(key){
@@ -1183,9 +1169,6 @@ export default {
     formatDateTime(time){
       return formatDate(time,'yyyy-MM-dd hh:mm');
     },
-    fnSetOrderMoney(){
-
-    },
   }
 }
 </script>

src/pages/order/orderCheck.vue

@@ -8,7 +8,7 @@
         <a-radio :value="3" v-if="isST24">设置为外发</a-radio>
       </a-radio-group>
     </a-form-model-item>
-    <a-form-model-item label="问题类型" prop="type">
+    <a-form-model-item v-if="isST24" label="问题类型">
       <a-radio-group v-model="form.type">
         <a-radio :value="1">EQ</a-radio>
         <a-radio :value="2">工艺</a-radio>
@@ -51,7 +51,7 @@ export default {
   data(){
     return{
       confirmSubmit:false,resFormTimes:'',isST24:false,
-      form:{orderId:'',sourceType:'',statue:'',type:'',contentType:null,content:''},
+      form:{orderId:'',sourceType:'',statue:'',type:null,contentType:null,content:''},
       layout:{labelCol:{span:5},wrapperCol:{span:18},},
       isAltN:false,loadPage:false,
       rules:{

src/pages/order/orderMoney.vue

@@ -0,0 +1,128 @@
+<template>
+  <a-modal title="调整价格" :visible="showAlt" :confirm-loading="confirmSubmit" @ok="fnSetOrderMoney" @cancel="fnHideAlt" width="700px" :footer='false'>
+  <a-spin :spinning="confirmSubmit">
+    <a-form-model :model="form" :rules="rules" v-bind="layout" ref="ruleForm">
+      <template v-if="sourceType==2">
+        <a-row>
+          <a-col :span="12"><a-form-model-item label="工程费"><a-input :disabled="!isEdit" type="number" v-model="form.costCostruction" /></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="加急费"><a-input :disabled="!isEdit" type="number" v-model="form.costJiaJi" /></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="工程费"><a-input :disabled="!isEdit" type="number" v-model="form.costCostruction"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="加急费"><a-input :disabled="!isEdit" type="number" v-model="form.costJiaJi"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="浮动金额"><a-input :disabled="!isEdit" type="number" v-model="form.orderPreferentialMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="锣程费"><a-input :disabled="!isEdit" type="number" v-model="form.routLengthMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="孔费"><a-input :disabled="!isEdit" type="number" v-model="form.holeMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="板费"><a-input :disabled="!isEdit" type="number" v-model="form.costBoard"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="测试费"><a-input :disabled="!isEdit" type="number" v-model="form.costTest"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="拼版费"><a-input :disabled="!isEdit" type="number" v-model="form.costPinBan"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="表面处理费"><a-input :disabled="!isEdit" type="number" v-model="form.costMetallize"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="菲林费"><a-input :disabled="!isEdit" type="number" v-model="form.costFilm"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="颜料费"><a-input :disabled="!isEdit" type="number" v-model="form.costColor"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="成型费"><a-input :disabled="!isEdit" type="number" v-model="form.costShap"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="其他费"><a-input :disabled="!isEdit" type="number" v-model="form.costOther"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="产品费"><a-input :disabled="!isEdit" type="number" v-model="form.orderTotalMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="税费"><a-input :disabled="!isEdit" type="number" v-model="form.orderTaxMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="运费"><a-input :disabled="!isEdit" type="number" v-model="form.orderShipMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="会员优惠券优惠金额"><a-input :disabled="!isEdit" type="number" v-model="form.memberCouponMoney"/></a-form-model-item></a-col>
+        </a-row>
+      </template>
+      <template v-else-if="sourceType==4">
+        <a-row>
+          <a-col :span="12"><a-form-model-item label="订单金额"><a-input disabled="disabled" type="number" v-model="form.totalPrice"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="单片价格"><a-input disabled="disabled" type="number" v-model="form.singlePrice"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="快递费"><a-input disabled="disabled" type="number" v-model="form.shipPrice"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="其他费用明细"><a-input disabled="disabled" type="number" v-model="form.costOther"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="板费"><a-input disabled="disabled" type="number" v-model="form.costBoard"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="工程费"><a-input disabled="disabled" type="number" v-model="form.costCostruction"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="菲林费"><a-input disabled="disabled" type="number" v-model="form.costFilm"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="表面处理费"><a-input disabled="disabled" type="number" v-model="form.costMetallize"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="其他费用"><a-input disabled="disabled" type="number" v-model="form.costOther"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="测试费"><a-input disabled="disabled" type="number" v-model="form.costTest"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="孔费"><a-input disabled="disabled" type="number" v-model="form.holeMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="拼版费"><a-input disabled="disabled" type="number" v-model="form.costPinBan"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="加急费"><a-input disabled="disabled" type="number" v-model="form.costJiaJi"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="颜料费"><a-input disabled="disabled" type="number" v-model="form.costColor"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="成型费"><a-input disabled="disabled" type="number" v-model="form.costShap"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="锣程费"><a-input disabled="disabled" type="number" v-model="form.routLengthMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="浮动价格"><a-input disabled="disabled" type="number" v-model="form.orderPreferentialMoney"/></a-form-model-item></a-col>
+          <a-col :span="12"><a-form-model-item label="调整金额"><a-input :disabled="!isEdit" type="number" v-model="form.adjustAmount"/></a-form-model-item></a-col>
+          <a-col :span="24"><a-form-model-item label="调整备注" :label-col="{ span:4, offset: 0 }" :wrapper-col="{ span:20, offset:0 }"><a-input :disabled="!isEdit" v-model="form.adjustRemark"/></a-form-model-item></a-col>
+        </a-row>
+      </template>
+      <div class="bn">
+        <a-space v-if="!isEdit"><a-button @click="fnHideAlt">关闭</a-button><a-button type="primary" @click="isEdit = true">编辑</a-button></a-space>
+        <a-space v-else><a-button @click="fnGetOrderMoney">取消</a-button><a-button type="primary" @click="fnSetOrderMoney">提交保存</a-button></a-space>
+      </div>
+    </a-form-model>
+  </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import {OrderMoney, OrderUpdateMoney} from "@/services/order/Order";
+
+export default {
+  name: "orderMoney",
+  props:['orderId','sourceType','showAlt','fnHiddenAlt'],
+  data(){
+    return{
+      confirmSubmit:true,tabMoneyForm:['2','4'],isEdit:false,
+      detail:{},
+      form:{},
+      rules:{},
+      layout:{labelCol:{span:8},wrapperCol:{span:16},},
+    }
+  },
+  watch:{
+    showAlt(){
+      if (this.showAlt) this.fnGetOrderMoney();
+    }
+  },
+  methods:{
+    fnGetOrderMoney(){
+      if (this.tabMoneyForm.indexOf(this.sourceType)<0){
+        this.$message.warn('暂无匹配的价格模板！');
+        return false;
+      }
+      this.isEdit = false;
+      this.confirmSubmit = true;
+      OrderMoney(this.orderId).then(res=>{
+        // console.log(this.sourceType,this.orderId);
+        if (res.success){
+          let db = JSON.parse(res.message);
+          this.form = db;
+          // let OST = this.sourceType;
+          this.confirmSubmit = false;
+        }else{
+          this.$message.error(res.message);
+        }
+      }).finally(()=>{})
+    },
+    fnHideAlt(){
+      this.fnHiddenAlt();
+    },
+    fnSetOrderMoney(){
+      if(this.confirmSubmit) return false;
+      let params = {
+        id:this.orderId,
+        keys:JSON.stringify(this.form)
+      }
+      this.confirmSubmit = true;
+      OrderUpdateMoney(params).then(res=>{
+        if (res.success){
+          this.$message.success(res.message)
+        }else this.$message.error(res.message);
+        this.fnGetOrderMoney();
+      }).finally(()=>{
+        this.confirmSubmit = false;
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+/deep/ .ant-form-item-label>label{display:inline-block; line-height:1.2em}
+/deep/ .ant-form-item-label{white-space:pre-wrap}
+.ant-form-item{margin-bottom:5px}
+.bn{text-align:center; clear:both; padding:20px 0}
+</style>

src/services/Merchants/Merchants.js

@@ -46,7 +46,6 @@ export function MerchantsListSearch(params) {
   return requestApi('/api/admin/merchants/lookup/search', METHOD.GET, params)
 }
 
-
 //商户充值
 export function MerchantsRecharge(id,patams) {
   return new Promise((resolve, reject) => {

src/services/order/Order.js

@@ -19,6 +19,15 @@ export function OrderCheck(params) {
   return requestApi('/api/app/order/audit-order', METHOD.POST, params)
 }
 
+// 订单价格
+export function OrderMoney(id) {
+  return requestApi(`/api/app/order/get-order-price-detail/${id}`, METHOD.GET, null)
+}
+// 修改订单价格
+export function OrderUpdateMoney(params) {
+  return requestApi(`/api/app/order/update-order-price`, METHOD.PUT, params)
+}
+
 /* 以下待删 */
 
 //获取SMT订单详情

src/utils/axios-interceptors.js

@@ -117,7 +117,7 @@ const resCommon = {
    * @returns {*}
    */
   onFulfilled(response, options) {
-    const { message } = options;
+    const {router, message } = options;
     // if (response?.success&&!response.success){
     //   console.log(response);
     // }
@@ -125,7 +125,7 @@ const resCommon = {
       message.error('认证 token 已过期，请重新登录');
       Cookie.remove(xsrfHeaderName);
       router.push('/loginjmp');
-      return Promise.reject(error);
+      return Promise.reject(response.message);
     }
     if (response.code === 200 || response.code === 204) {
       if (!response.isSuccess) {