平台订单导入

dist/static/js/app.js

@@ -6522,7 +6522,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _nod
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-eval("// 本地\nmodule.exports = {\n  title: \"采销平台\",\n  baseUrl: \"http://localhost:8080\",\n  api: {\n    //web域名 http://stockweb.test241.wanyuhengtong.com/\n    // userApi: 'http://www.invoice.com/',\n    // baseApi: 'http://www.stock.com/',\n    userApi: \"http://inv.test241.wanyuhengtong.com/\",\n    baseApi: \"http://stock.test241.wanyuhengtong.com/\"\n  },\n  webUrl: \"http://share.sitw.wanyuhengtong.com/#/test-good-share?id=\",\n  fileURL: \"https://api2.edusit.zretchome.com\",\n  shareWebUrl: \"http://ss.test241.wanyuhengtong.com/?prod=0&outCode=\",\n  appId: \"wx5ac3a2c2d72b6f26\",\n  ding: {\n    //企业id\n    CorpId: \"dingc78fa4301e1a424a35c2f4657eb6378f\",\n    //应用凭证\n    AgentId: \"1324690581\"\n  }\n};\n\n//# sourceURL=webpack:///./src/config/env.development.js?");
+eval("// 本地\nmodule.exports = {\n  title: \"采销平台\",\n  baseUrl: \"http://localhost:8080\",\n  api: {\n    //web域名 http://stockweb.test241.wanyuhengtong.com/\n    // userApi: 'http://www.invoice.com/',\n    // baseApi: 'http://www.stock.com/',\n    userApi: \"http://inv.test241.wanyuhengtong.com/\",\n    baseApi: \"http://stock.test241.wanyuhengtong.com/\" // userApi: 'http://inv.sitw.wanyuhengtong.com/',\n    // baseApi: 'http://stock.api.wanyuhengtong.com/',\n\n  },\n  webUrl: \"http://share.sitw.wanyuhengtong.com/#/test-good-share?id=\",\n  fileURL: \"https://api2.edusit.zretchome.com\",\n  shareWebUrl: \"http://ss.test241.wanyuhengtong.com/?prod=0&outCode=\",\n  appId: \"wx5ac3a2c2d72b6f26\",\n  ding: {\n    //企业id\n    CorpId: \"dingc78fa4301e1a424a35c2f4657eb6378f\",\n    //应用凭证\n    AgentId: \"1324690581\"\n  }\n};\n\n//# sourceURL=webpack:///./src/config/env.development.js?");
 
 /***/ }),
 

src/config/env.development.js

@@ -9,6 +9,8 @@ module.exports = {
 
     userApi: "http://inv.test241.wanyuhengtong.com/",
     baseApi: "http://stock.test241.wanyuhengtong.com/",
+    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   webUrl: "http://share.sitw.wanyuhengtong.com/#/test-good-share?id=",
   fileURL: `https://api2.edusit.zretchome.com`,

src/views/orderEntry/orderConfirm/index.vue

@@ -57,16 +57,20 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ importSitem.platform_code }}
                   </div>
-                  <div style="min-height: 26px">{{ importSitem.po_code }}</div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ importSitem.po_code }}
+                  </div>
                 </el-col>
                 <el-col :span="9">
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ confirmSitem.platform_code }}
                   </div>
-                  <div style="min-height: 26px">{{ confirmSitem.po_code }}</div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ confirmSitem.po_code }}
+                  </div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -103,18 +107,18 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ importSitem.platform_time }}
                   </div>
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ importSitem.plat_code }}
                   </div>
                 </el-col>
                 <el-col :span="9"
-                  ><div style="min-height: 26px">
+                  ><div style="min-height: 26px; word-break: break-all">
                     {{ confirmSitem.platform_time }}
                   </div>
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ confirmSitem.plat_code }}
                   </div>
                   <div v-if="conGoodData && conGoodData.good_thumb_img">
@@ -335,14 +339,18 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div style="min-height: 26px">{{ importSitem.mode }}</div>
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ importSitem.mode }}
+                  </div>
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ importSitem.sale_source }}
                   </div>
                 </el-col>
                 <el-col :span="9">
-                  <div style="min-height: 26px">{{ confirmSitem.mode }}</div>
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ confirmSitem.mode }}
+                  </div>
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ confirmSitem.sale_source }}
                   </div></el-col
                 >
@@ -396,18 +404,18 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ importSitem.contactor }}
                   </div>
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ importSitem.mobile }}
                   </div>
                 </el-col>
                 <el-col :span="9">
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ confirmSitem.contactor }}
                   </div>
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ confirmSitem.mobile }}
                   </div></el-col
                 >
@@ -447,14 +455,18 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div style="min-height: 26px">&nbsp;</div>
-                  <div style="min-height: 26px">
+                  <div style="min-height: 26px; word-break: break-all">&nbsp;</div>
+                  <div style="min-height: 26px; word-break: break-all">
                     {{ importSitem.addr }}
                   </div></el-col
                 >
                 <el-col :span="9">
-                  <div style="min-height: 26px">{{ confirmSitem.addr_name }}&nbsp;</div>
-                  <div style="min-height: 26px">{{ confirmSitem.addr }}</div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ confirmSitem.addr_name }}&nbsp;
+                  </div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ confirmSitem.addr }}
+                  </div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -489,10 +501,10 @@
             <div class="tab-item-label"><label style="color: red">*</label>订单备注</div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4" style="min-height: 26px">{{
+                <el-col :span="4" style="min-height: 26px; word-break: break-all">{{
                   importSitem.order_remark
                 }}</el-col>
-                <el-col :span="9" style="min-height: 26px">{{
+                <el-col :span="9" style="min-height: 26px; word-break: break-all">{{
                   confirmSitem.order_remark
                 }}</el-col>
                 <el-col :span="11">
@@ -515,12 +527,20 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div style="min-height: 26px">{{ importSitem.num }}</div>
-                  <div style="min-height: 26px">{{ importSitem.price }}</div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ importSitem.num }}
+                  </div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ importSitem.price }}
+                  </div>
                 </el-col>
                 <el-col :span="9">
-                  <div style="min-height: 26px">{{ confirmSitem.num }}</div>
-                  <div style="min-height: 26px">{{ confirmSitem.price }}</div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ confirmSitem.num }}
+                  </div>
+                  <div style="min-height: 26px; word-break: break-all">
+                    {{ confirmSitem.price }}
+                  </div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -570,10 +590,10 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4" style="min-height: 26px">{{
+                <el-col :span="4" style="min-height: 26px; word-break: break-all">{{
                   importSitem.activity_name
                 }}</el-col>
-                <el-col :span="9" style="min-height: 26px">{{
+                <el-col :span="9" style="min-height: 26px; word-break: break-all">{{
                   confirmSitem.activity_name
                 }}</el-col>
                 <el-col :span="11">
@@ -605,13 +625,13 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4" style="min-height: 26px">{{
+                <el-col :span="4" style="min-height: 26px; word-break: break-all">{{
                   importSitem.before_discount_all_price
                 }}</el-col>
-                <el-col :span="9" style="min-height: 26px">{{
+                <el-col :span="9" style="min-height: 26px; word-break: break-all">{{
                   confirmSitem.before_discount_all_price
                 }}</el-col>
-                <el-col :span="11" style="min-height: 26px">
+                <el-col :span="11" style="min-height: 26px; word-break: break-all">
                   {{ ruleForm.before_discount_all_price }}</el-col
                 >
               </el-row>
@@ -635,7 +655,7 @@
       </el-form>
       <search-good-online-modal
         :once="true"
-        :sitem="{}"
+        :sitem="{ platform_code: platform_id }"
         :active="true"
         :show-model="showModel"
         @resultList="resultList"
@@ -881,8 +901,8 @@ export default {
       if (plat_code && plat_code !== "") {
         await this.get_goods_active();
       }
-      if (this.subGoodData.platform_code) {
-        await this.get_source(this.subGoodData.platform_code);
+      if (this.platform_id) {
+        await this.get_source();
       }
     },
 
@@ -906,7 +926,9 @@ export default {
           error_msg,
           platform_name,
           platform_title,
+          platform_id,
         } = data;
+        this.platform_id = platform_id;
         this.sitem = {
           orderCode,
           status,
@@ -957,18 +979,19 @@ export default {
       this.loading = true;
       const { code, data, message } = await asyncRequest.good_detail({
         plat_code: good_code,
+        platform_id: this.platform_id,
       });
       if (code === 0) {
         if (type === 1) {
           this.conGoodData = data;
         } else {
           this.subGoodData = data;
-          const { platform_name, platform_code } = data;
+          const { platform_name } = data;
           if (this.status !== "2") {
             this.sitem.platform_name = platform_name + "客户";
           }
-          if (platform_code) {
-            await this.get_source(platform_code);
+          if (this.platform_id) {
+            await this.get_source(this.platform_id);
           }
         }
       } else if (code >= 100 && code <= 104) {
@@ -981,11 +1004,10 @@ export default {
       this.loading = false;
     },
 
-    async get_source(platform_code) {
-      this.platform_id = platform_code;
+    async get_source() {
       this.coptions = [];
       const { code, data, message } = await asyncRequest.sourceList({
-        platform_id: platform_code,
+        platform_id: this.platform_id,
       });
       if (code === 0) {
         this.coptions = data;

src/views/orderEntry/orderEnter/index.vue

@@ -32,6 +32,7 @@
                     parmValue.page = 1;
                     searchList();
                   "
+                  clearable
                   :size="searchSize"
                   v-model="parmValue.status"
                   style="width: 100%"
@@ -189,10 +190,10 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((i) => i == '007') && scope.row.status !== '5'"
             effect="dark"
             content="详情"
             placement="top"
+            v-if="powers.some((i) => i == '007') && scope.row.status !== '5'"
           >
             <i
               class="el-icon-view tb-icon"