1

.env

@@ -9,10 +9,10 @@ VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
 
 # api服务的baseUrls
-VUE_APP_API_IDS=https://ids.justfit.com
-VUE_APP_API_BASE_URL_API=https://agentapi.justfit.com
+VUE_APP_API_IDS=http://localhost:44339/
+VUE_APP_API_BASE_URL_API=http://localhost:44354/
 VUE_APP_API_COMMON_BASE_URL=https://api.allpcb.com
 VUE_APP_API_OSS_BASE_URL=https://member.justfit.com
 VUE_APP_API_ALLPCB_BASE_URL=https://www.allpcb.com
 
-VUE_APP_YFZX_CSZ=115ecffc-261a-464d-c9c4-3a0343848dd6
+VUE_APP_YFZX_CSZ=115ecffc-261a-464d-c9c4-3a0343848dd6

.env.test

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

src/layouts/tabs/TabsView.vue

@@ -402,9 +402,12 @@ table.tablesd{border:1px solid #eee; border-right:none; border-bottom:none; widt
 .boxCraftDto li{float: left; list-style: none; border:1px solid #eee; padding: 10px; border-radius:.5em; margin:0 20px 10px 0}
 .listTable{border:1px solid #eee; border-right:none; border-bottom:none; display: flex; flex-wrap: wrap; padding:0; margin:0 0 1.5em}
 .listTable>li{border:1px solid #eee; border-left:none; border-top:none; width:25%; list-style: none; margin:0; display:flex}
+.listTable>li.edit .t{color:#f30; font-weight: bold}
 .listTable>li span.t,.listTable>li p.n{padding:.5em}
 .listTable>li span.t{width:15em; background-color: #f9f9f9; text-align:right}
 .listTable>li p.n{width:100%; margin-bottom:0; word-break: break-all;}
+.bnCenter{text-align: center; padding:.5em 0;}
+.bnCenter>*{display: inline-block; margin:0 .5em;}
 @media screen and (max-width:1300px) {
   .listTable>li{width:33.333%}
 }

src/pages/Common/altLog.vue

@@ -0,0 +1,64 @@
+<template>
+  <a-modal title="订单日志" width="1000px" :visible="showLog" :confirm-loading="confirmSubmit" @cancel="showLog=false" :footer="null">
+    <a-table class="tablesa" :columns="tableColumns" :data-source="tableData" :rowKey="lists => lists.id" :pagination="pagination" :loading="tableLoad" @change="getLogList">
+      <span slot="creationTime" slot-scope="text">{{formatDateTime(text)}}</span>
+      <span slot="creatorId" slot-scope="text" :title="text" style="max-width:68px; display:block; overflow: hidden; white-space:nowrap;">{{text}}</span>
+    </a-table>
+  </a-modal>
+</template>
+
+<script>
+import {getLogs} from "@/services/order/Order";
+import {formatDate} from "@/services/Common";
+export default {
+  name: "bnOrderLogList",
+  props:['orderId','type'],
+  data(){
+    return{
+      tableLoad: false,showLog:false,confirmSubmit:false,
+      tableColumns:[
+        {title: '操作时间',dataIndex: 'creationTime',key: 'creationTime',width:'150px',scopedSlots: { customRender: 'creationTime' }},
+        {title: '操作人ID',dataIndex: 'creatorId',key: 'creatorId',width:'100px',scopedSlots: { customRender: 'creatorId' }},
+        {title: '操作类型',dataIndex: 'logTypeValue',key: 'logTypeValue',width:'120px'},
+        {title: '修改内容',dataIndex: 'content',key: 'content'},
+        // {title: '内容前后',dataIndex: 'afterData',key: 'afterData',scopedSlots: { customRender: 'afterData' },},
+      ],
+      tableData:[],
+      pagination: {
+        pageSize: 10,
+        current: 1,
+        total:0,
+        // showQuickJumper: true,
+        // showTotal: (total) => `总计 ${total} 条`,
+      },
+    }
+  },
+  methods:{
+    //展示日志
+    fnShowLog(){
+      this.showLog=true;
+      this.getLogList();
+    },
+    async getLogList(page){
+      this.tableLoad = true;
+      if(typeof(page)=='object') this.pagination.current = page.current;
+      let count = (this.pagination.current)*this.pagination.pageSize;
+      let params={
+        page:count,
+        pageSize:this.pagination.pageSize,
+      }
+      let res = await getLogs(params,this.orderId);
+      this.tableData = res.items;
+      // this.pagination.total = res.totalCount;
+      this.tableLoad = false;
+    },
+    formatDateTime(time){
+      return formatDate(time);
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/pages/order/orderCheck.vue

@@ -4,8 +4,8 @@
     <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 :value="0">审核不通过驳回</a-radio>
+        <a-radio :value="2" v-if="isST24">设置为外发</a-radio>
       </a-radio-group>
     </a-form-model-item>
     <a-form-model-item v-if="isST24" label="问题类型">
@@ -28,6 +28,12 @@
     <a-form-model-item label="备注说明">
       <quill-editor :options="editorOption" ref="myTextEditor" v-model="form.content"></quill-editor>
     </a-form-model-item>
+    <a-form-model-item label="是否发邮件">
+      <a-radio-group button-style="solid" v-model="form.sendEmail">
+        <a-radio-button :value="true">是</a-radio-button>
+        <a-radio-button :value="false">否</a-radio-button>
+      </a-radio-group>
+    </a-form-model-item>
   </a-form-model>
     <div class="bn" v-if="!isAltN">
       <a-button type="primary" @click="fnOrderCheck">确定</a-button>
@@ -51,7 +57,7 @@ export default {
   data(){
     return{
       confirmSubmit:false,resFormTimes:'',isST24:false,
-      form:{orderId:'',sourceType:'',statue:'',type:null,contentType:null,content:''},
+      form:{orderId:'',sourceType:'',statue:'',type:null,contentType:null,content:'',sendEmail:false},
       layout:{labelCol:{span:5},wrapperCol:{span:18},},
       isAltN:false,loadPage:false,
       rules:{
@@ -148,4 +154,4 @@ export default {
 .bn{text-align:center; clear:both}
 /deep/ .ql-editor{height:220px}
 /deep/ .ql-toolbar.ql-snow{padding:3px 8px; line-height:24px}
-</style>
+</style>

src/services/Common.js

@@ -92,7 +92,7 @@ export function resSelects(type='',val=''){
   }
   else if (type==='parseStatue'){
     list = [
-      {value:'0',text:'带解析'},
+      {value:'0',text:'待解析'},
       {value:'1',text:'锁定中'},
       {value:'2',text:'解析成功'},
       {value:'3',text:'解析失败'},
@@ -146,4 +146,4 @@ export function downloadBlobFile(content,type,fileName){
   } else { // IE10+下载
     navigator.msSaveBlob(blob, fileName)
   }
-}
+}

src/services/order/Order.js

@@ -27,6 +27,20 @@ export function OrderMoney(id) {
 export function OrderUpdateMoney(params) {
   return requestApi(`/api/app/order/update-order-price`, METHOD.PUT, params)
 }
+// 审单同步结果到订单池保存数据
+export function checkByOrder(params) {
+  return requestApi(`/api/app/order/check-by-order`, METHOD.POST, params)
+}
+// 日志
+export function getLogs(params,id) {
+  return requestApi(`/api/app/order/log/${id}`, METHOD.GET, params)
+}
+
+
+
+
+
+
 
 /* 以下待删 */
 

src/utils/axios-interceptors.js

@@ -10,9 +10,13 @@ const resp401 = {
    */
   onFulfilled(response, options) {
     const { message } = options;
+    console.log()
     if (response.code === 401) {
       message.error('无此权限');
     }
+    if (response?.data?.code==40002){
+      message.error(response?.data.message);
+    }
     return response;
   },
   /**

vue.config.js

@@ -57,7 +57,8 @@ module.exports = {
     proxy: {
       ...proxyConfig,
       '/ids': {
-        target: 'http://192.168.19.4:44339',
+        // target: 'http://115.236.37.105:1136',
+        target: 'https://dfmserver.jiepei.com:44336/ids',
         changeOrigin: true,
         pathRewrite: {
           '^/ids': ''
@@ -65,7 +66,7 @@ module.exports = {
         logLevel: 'debug',
       },
       '/api': {
-        target: 'http://192.168.19.4:44332',
+        target: 'https://dfmserver.jiepei.com:44336',
         changeOrigin: true,
         pathRewrite: {},
         logLevel: 'debug',