Merge branch 'sit'

src/config/env.development.js

@@ -1,23 +1,23 @@
 // 本地
 module.exports = {
-  title: '采销平台',
-  baseUrl: 'http://localhost:8080',
+  title: "采销平台",
+  baseUrl: "http://localhost:8080",
   api: {
     //web域名 http://stockweb.test241.wanyuhengtong.com/
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    userApi: 'http://inv.test241.wanyuhengtong.com/',
-    baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    userApi: "http://inv.test241.wanyuhengtong.com/",
+    baseApi: "http://stock.test241.wanyuhengtong.com/",
   },
-  webUrl:'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
+  webUrl: "http://share.sitw.wanyuhengtong.com/#/test-good-share?id=",
   fileURL: `https://api2.edusit.zretchome.com`,
-  shareWebUrl:'http://ss.test241.wanyuhengtong.com/?prod=0&outCode=',
-  appId: 'wx5ac3a2c2d72b6f26',
+  shareWebUrl: "http://ss.test241.wanyuhengtong.com/?prod=0&outCode=",
+  appId: "wx5ac3a2c2d72b6f26",
   ding: {
     //企业id
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
     //应用凭证
-    AgentId: "1324690581"
-  }
-}
+    AgentId: "1324690581",
+  },
+};

src/views/sellOut/sellOutOrder/detail.vue

@@ -98,7 +98,7 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
-            <!-- <el-collapse-item title="商品信息" name="2">
+            <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -106,7 +106,7 @@
                 :skucode="sitem.skuCode"
                 :spucode="sitem.good_code"
               />
-            </el-collapse-item> -->
+            </el-collapse-item>
             <el-collapse-item
               title="库管发货"
               name="3"

src/views/youzan/othTransferOrderLog/columns.js

@@ -12,7 +12,7 @@ const columns = [
     minWidth: "100px",
   },
   {
-    prop: "oid",
+    prop: "tid",
     label: "平台订单号",
     minWidth: "160px",
   },

src/views/youzan/othTransferOrderLog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="othTransferOrderLog pagePadding">
-    <div v-if=" powers.some((i) => i == '001')">
+    <div v-if="powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -68,24 +68,6 @@
               </el-col>
             </el-row>
             <el-row style="width: 100%">
-              <!-- <el-col :span="4" style="width: 480px">
-                <el-select
-                  v-model="elSelect"
-                  :size="searchSize"
-                  style="width: 140px"
-                  placeholder="关键字类型"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option label="平台订单号" :value="'1'"></el-option>
-                  <el-option label="平台商品编号" :value="'2'"></el-option>
-                  <el-option label="销售订单号" :value="'3'"></el-option>
-                  <el-option label="线上商品编号" :value="'4'"></el-option>
-                </el-select>
-              </el-col> -->
               <el-col :span="4" style="width: 480px">
                 <el-input
                   :size="searchSize"
@@ -226,7 +208,7 @@ export default {
         elSelect: "1",
         addtime_start: "",
         addtime_end: "",
-        oid: "",
+        tid: "",
         plat_code: "",
         orderCode: "",
         skuCode: "",
@@ -271,7 +253,7 @@ export default {
         addtime_start: "",
         addtime_end: "",
         elSelect: "1",
-        oid: "",
+        tid: "",
         plat_code: "",
         orderCode: "",
         skuCode: "",
@@ -319,7 +301,7 @@ export default {
     async resetOrder(id) {
       if (this.loading) return;
       this.loading = true;
-      const { code, data, message } = await asyncRequest.retry({ id: id });
+      const { code, message } = await asyncRequest.retry({ id: id });
       if (code === 0) {
         this.loading = false;
         await this.searchList();
@@ -342,7 +324,7 @@ export default {
       }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
-      model.oid = model.elSelect === "1" ? this.sinput : "";
+      model.tid = model.elSelect === "1" ? this.sinput : "";
       model.plat_code = model.elSelect === "2" ? this.sinput : "";
       model.orderCode = model.elSelect === "3" ? this.sinput : "";
       model.skuCode = model.elSelect === "4" ? this.sinput : "";