add

src/api/company/scheduleReport.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询中医档期业绩报表列表
 export function listTcmScheduleReport(query) {
   return request({
-    url: '/company/tcmScheduleReport/list',
+    url: '/company/scheduleReport/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listTcmScheduleReport(query) {
 // 查询中医档期业绩报表详细
 export function getTcmScheduleReport(id) {
   return request({
-    url: '/company/tcmScheduleReport/' + id,
+    url: '/company/scheduleReport/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getTcmScheduleReport(id) {
 // 新增中医档期业绩报表
 export function addTcmScheduleReport(data) {
   return request({
-    url: '/company/tcmScheduleReport',
+    url: '/company/scheduleReport',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addTcmScheduleReport(data) {
 // 修改中医档期业绩报表
 export function updateTcmScheduleReport(data) {
   return request({
-    url: '/company/tcmScheduleReport',
+    url: '/company/scheduleReport',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateTcmScheduleReport(data) {
 // 删除中医档期业绩报表
 export function delTcmScheduleReport(id) {
   return request({
-    url: '/company/tcmScheduleReport/' + id,
+    url: '/company/scheduleReport/' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delTcmScheduleReport(id) {
 // 导出中医档期业绩报表
 export function exportTcmScheduleReport(query) {
   return request({
-    url: '/company/tcmScheduleReport/export',
+    url: '/company/scheduleReport/export',
     method: 'get',
     params: query
   })
@@ -56,7 +56,7 @@ export function exportTcmScheduleReport(query) {
 // 查询中医档期管理列表
 export function listSchedule(query) {
   return request({
-    url: '/company/tcmScheduleReport/getScheduleList',
+    url: '/company/scheduleReport/getScheduleList',
     method: 'get',
     params: query
   })

src/api/store/express.js

@@ -66,4 +66,11 @@ export function allotExpress(data,omsCode) {
     method: 'post',
     data: data
   })
+}
+
+export function getCompanyByOmsCode(omsCode) {
+  return request({
+    url: '/store/express/omsCode/' + omsCode,
+    method: 'get'
+  })
 }

src/views/company/company/index.vue

@@ -185,16 +185,27 @@
         <el-form-item label="坐席数量" prop="voiceCallerNumber">
           <el-input-number v-model="form.voiceCallerNumber"  :min="0" :max="10000"  ></el-input-number>
         </el-form-item>
-        <el-form-item label="选择快递" prop="omsCode">
-          <el-select clearable v-model="form.omsCode"  placeholder="请选择快递名称"  size="small">
-              <el-option
-                v-for="item in expressOptions"
-                :key="item.omsCode"
-                :label="item.name"
-                :value="item.omsCode"
-              />
-          </el-select>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选择快递" prop="omsCode">
+              <el-select clearable v-model="form.omsCode"  placeholder="请选择快递名称"  size="small" @change="selectOmsCode">
+                  <el-option
+                    v-for="item in expressOptions"
+                    :key="item.omsCode"
+                    :label="item.name"
+                    :value="item.omsCode"
+                  />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="OMS编码" >
+              <el-input v-model="erpForm.omsCode"  disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
+        
         <el-form-item  label="管理员帐号" prop="userName" v-if="form.companyId==null">
           <el-input v-model="form.userName" placeholder="请输入管理员帐号" />
         </el-form-item>
@@ -353,6 +364,7 @@ export default {
       },
       // 表单参数
       form: {},
+      erpForm:{},
       // 表单校验
       rules: {
         companyName: [
@@ -405,6 +417,10 @@ export default {
     this.getList();
   },
   methods: {
+    selectOmsCode(){
+      const item = this.expressOptions.find(item1=> item1.omsCode === this.form.omsCode)
+      this.erpForm.omsCode = item.omsCode;
+    },
     handleDeduct(row) {
       const companyId = row.companyId  
       this.deductForm.companyId=row.companyId;
@@ -517,6 +533,7 @@ export default {
           });
            
         }
+        this.erpForm.omsCode = response.data.omsCode;
         this.open = true;
         this.title = "修改公司";
       });

src/views/store/components/productOrder.vue

@@ -153,6 +153,21 @@
                 </span>
             </el-descriptions-item>
       </el-descriptions>
+      <div style="margin: 20px 0px"  v-if="order!=null">
+        <span class="font-small">
+          凭证信息
+        </span>
+      </div>
+      <el-image 
+          v-if="certificates != ''"
+          :src="certificates"
+          :preview-src-list="[certificates]"
+          :style="{ width: '100px', height: '100px' }"
+          @click.native="showImageDialog"
+        ></el-image>
+        <el-dialog :visible.sync="dialogVisibleImage" width="10%">
+          <img :src="certificates" style="width: 100%" alt="">
+        </el-dialog>
       <div style="margin-top: 20px">
         <span class="font-small">商品信息</span>
       </div>
@@ -315,10 +330,11 @@
                     />
             </el-select>
         </el-form-item>
-       <el-form-item label="状态" prop="status" v-if="order.status >=1">
+       <el-form-item label="状态" prop="status" v-if="orderStatus >=1">
            <el-select style="width:220px" v-model="editForm.status" placeholder="请选择状态" clearable size="small">
             <el-option key="1"  label="待发货" value="1" />
              <el-option key="2"  label="待收货" value="2" />
+             <el-option key="-2"  label="已退款" value="-2" />
            </el-select>
          </el-form-item>
         <el-form-item label="备注" prop="mark"  >
@@ -427,6 +443,7 @@ export default {
   name: "order",
   data() {
     return {
+      dialogVisibleImage: false,
       createTypeOptions:[],
       deliveryStatusOptions:[],
       deliveryTypeOptions:[],
@@ -467,6 +484,8 @@ export default {
       orderTypeOptions:[],
       payTypeOptions:[],
       statusOptions:[],
+      certificates:'',
+      orderStatus:null,
       order:null,
       user:{},
       logs:[],
@@ -500,6 +519,9 @@ export default {
     });
   },
   methods: {
+    showImageDialog() {
+      this.dialogVisible = true;
+    },
     syncExpress(){
       var that=this;
         this.$confirm('确定同步物流状态吗', "警告", {
@@ -694,6 +716,12 @@ export default {
         this.orderId=orderId;
         getStoreOrder(orderId).then(response => {
             this.order = response.order;
+            if(response.order.certificates != null){
+              this.certificates = response.order.certificates;
+            }
+            if(response.order.status != null){
+              this.orderStatus = response.order.status;
+            }  
             this.user = response.user;
             this.logs = response.logs;
             this.items = response.items;

src/views/store/express/index.vue

@@ -120,26 +120,29 @@
         :filter-method="filterMethod"
         filter-placeholder="请输入公司名称"
         v-model="value"
+        :titles="['所有公司', '已选公司']"
+        :right-default-checked="value"
         :data="allCompanies">
-        
       </el-transfer>
-    <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleAllotCompany">分 配</el-button>
-        <el-button @click="cancel1">取 消</el-button>
-    </div>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="handleAllotCompany">分 配</el-button>
+          <el-button @click="cancel1">取 消</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listExpress, getExpress, delExpress, addExpress, updateExpress, exportExpress ,allotExpress ,getExpressList} from "@/api/store/express";
+import { listExpress, getExpress, delExpress, addExpress, updateExpress, exportExpress ,allotExpress ,getExpressList,getCompanyByOmsCode} from "@/api/store/express";
 import { getCompanyList} from "@/api/company/company";
 export default {
   name: "Express",
   data() {
     return {
+      
       formId:null,
         value: [],
+        value2:[],
         filterMethod(query, item) {
           return item.label.indexOf(query) > -1;
         },
@@ -217,18 +220,6 @@ export default {
 
     /** 查询快递公司列表 */
     getList() {
-      getCompanyList().then(response => {
-      let data = [];
-      response.data.forEach((item,index) => {
-        data.push({
-          key: item.companyId,
-          label:item.companyName,
-        })
-      });
-      this.allCompanies = data;
-      console.log("aaaa",data);
-    });
-
       this.loading = true;
       listExpress(this.queryParams).then(response => {
         this.expressList = response.rows;
@@ -281,9 +272,26 @@ export default {
       this.open = true;
       this.title = "添加快递公司";
     },
+    /**分配公司按钮 */
     handleAllot(row){
       this.allot.open = true;
       this.formId = row.omsCode;
+      getCompanyList().then(response => {
+      let data = [];
+      response.data.forEach((item,index) => {
+        data.push({
+          key: item.companyId,
+          label:item.companyName,
+        })
+      });
+      this.allCompanies = data;
+    });
+    const omsCode = row.omsCode;
+    getCompanyByOmsCode(omsCode).then(response => {      
+      this.value = response.data2
+      console.log(this.value);
+    });
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -347,10 +355,8 @@ export default {
         }).catch(function() {});
     }
   },
-
 };
 </script>
-
 <style scoped lang="scss">
 .container {
   display: flex;
@@ -385,3 +391,4 @@ export default {
 }
 
 </style>
+

src/views/store/storePayment/index.vue

@@ -31,6 +31,17 @@
         />
       </el-form-item>
 
+      <el-form-item label="外部订单" prop="tradeNo">
+        <el-input
+          
+          v-model="queryParams.tradeNo"
+          placeholder="请输入外部订单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
 
       <el-form-item label="交易单号" prop="bankTransactionId">
         <el-input
@@ -142,6 +153,7 @@
       <el-table-column label="ID" align="center" prop="paymentId" /> 
       <el-table-column label="付款单号" align="center" prop="payCode" width="120px" />
       <el-table-column label="订单号" align="center" prop="orderCode"  width="120px" />
+      <el-table-column label="外部订单号" align="center" prop="tradeNo"  width="120px" />
       <el-table-column label="会员手机号" align="center" prop="userPhone"  width="120px" />
       <el-table-column label="支付类型" align="center" prop="payTypeCode" />
       <el-table-column label="支付金额" align="center" prop="payMoney" />