admin前端bug提交 8.29 zyp

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/express/index.vue

@@ -113,31 +113,39 @@
       </div>
     </el-dialog>
 
+    <!--分配公司按钮弹窗-->
     <el-dialog :title="allot.title" :visible.sync="allot.open" width="700px" append-to-body>
+      
       <el-transfer
         filterable
+        v-model="value"
+        :titles="['所有公司', '已选公司']"
         :filter-method="filterMethod"
+        :right-default-checked="value"
         filter-placeholder="请输入公司名称"
-        v-model="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>
+  
     </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;
         },
@@ -215,18 +223,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;
@@ -279,9 +275,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,34 +360,4 @@ export default {
   },
 
 };
-</script>
-
-<style>
-.container {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 20px;
-}
-
-.box {
-  width: 300px;
-}
-
-.el-scrollbar {
-  max-height: 200px;
-  overflow-y: auto; /* 添加滚动条 */
-}
-
-/* 新增样式 */
-.container {
-  display: flex;
-  justify-content: center;
-  align-items: flex-start;
-}
-
-.box {
-  margin: 0 10px;
-}
-
-
-</style>
+</script>

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" />