build

src/components/globalComponents/search-express/main.vue

@@ -40,6 +40,7 @@ export default {
     "placeholder",
     "isDetail",
     "disabled",
+    "order_source",
     "names",
     "type",
     "name",
@@ -68,6 +69,7 @@ export default {
       options: [],
       formValue: {
         type: "",
+        order_source: "",
         name: "",
       },
     };
@@ -108,14 +110,15 @@ export default {
       this.selectLoading = true;
       if (query !== "") {
         this.options = [];
-        let formValue = {
+        this.formValue = {
           //看接口入参字段
           type: "",
+          order_source: this.order_source,
           name: query,
         };
-        let res = await asyncRequest.list(formValue);
-        if (res && res.code === 0 && res.data) {
-          let arr = res.data;
+        const { code, data, message } = await asyncRequest.list(this.formValue);
+        if (code === 0) {
+          let arr = data ?? [];
           arr.forEach((element) => {
             let obj = {
               value: element.id,
@@ -127,11 +130,11 @@ export default {
             };
             this.options.push(obj);
           });
-          console.log(this.options, "options");
-        } else if (res && res.code >= 100 && res.code <= 104) {
+          // console.log(this.options, "options");
+        } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {
-          this.$message.warning(res.message);
+          this.$message.warning(message);
         }
       } else {
         this.options = [];
@@ -142,5 +145,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/views/goodStore/active/components/baseForm.vue

@@ -123,11 +123,7 @@
             )
           "
         >
-          <el-form-item
-            label="活动商品"
-            :label-position="'top'"
-            prop="good_list"
-          >
+          <el-form-item label="活动商品" :label-position="'top'" prop="good_list">
             <el-table
               :data="ruleForm.good_list"
               stripe
@@ -141,16 +137,8 @@
                 show-overflow-tooltip
                 width="170"
               />
-              <el-table-column
-                prop="good_name"
-                label="商品名称"
-                show-overflow-tooltip
-              />
-              <el-table-column
-                prop="activity_stock"
-                label="活动库存"
-                width="180"
-              >
+              <el-table-column prop="good_name" label="商品名称" show-overflow-tooltip />
+              <el-table-column prop="activity_stock" label="活动库存" width="180">
                 <template slot-scope="scope">
                   <el-input-number
                     v-show="type !== 'view'"
@@ -161,9 +149,7 @@
                     :precision="0"
                     label="活动库存"
                   ></el-input-number>
-                  <span v-show="type === 'view'">{{
-                    scope.row.activity_stock
-                  }}</span>
+                  <span v-show="type === 'view'">{{ scope.row.activity_stock }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -211,11 +197,8 @@
                         : ''
                     "
                     v-text="
-                      (
-                        options.find(
-                          (item) => item.value == scope.row.status
-                        ) || {}
-                      ).label || '--'
+                      (options.find((item) => item.value == scope.row.status) || {})
+                        .label || '--'
                     "
                   ></el-tag>
                 </template>
@@ -245,11 +228,7 @@
                   </el-tooltip>
                 </template>
                 <template slot-scope="scope">
-                  <el-tooltip
-                    effect="dark"
-                    content="查看商品信息"
-                    placement="top"
-                  >
+                  <el-tooltip effect="dark" content="查看商品信息" placement="top">
                     <i
                       class="el-icon-view tb-icon"
                       @click="showGoodModelFun(scope.row.skuCode)"
@@ -290,19 +269,13 @@
     <el-col
       :span="24"
       v-if="status === ''"
-      style="
-        text-align: right;
-        padding: 15px 0 15px 0;
-        border-top: 1px solid #dcdfe6;
-      "
+      style="text-align: right; padding: 15px 0 15px 0; border-top: 1px solid #dcdfe6"
     >
-      <el-button :size="'mini'" type="primary" @click="submitForm"
-        >保 存
-      </el-button>
+      <el-button :size="'mini'" type="primary" @click="submitForm">保 存 </el-button>
     </el-col>
   </div>
 </template>
-   <script>
+<script>
 import asyncRequest from "@/apis/service/goodStore/active";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
@@ -328,9 +301,8 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
     powers() {
       let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "activeDetail"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "activeDetail") ||
+        {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {
@@ -368,9 +340,7 @@ export default {
             this.ruleForm.activity_end != "" &&
             time
           ) {
-            return (
-              time.getTime() > new Date(this.ruleForm.activity_end).valueOf()
-            );
+            return time.getTime() > new Date(this.ruleForm.activity_end).valueOf();
           }
         },
       },
@@ -381,9 +351,7 @@ export default {
             this.ruleForm.activity_start != "" &&
             time
           ) {
-            return (
-              time.getTime() < new Date(this.ruleForm.activity_start).valueOf()
-            );
+            return time.getTime() < new Date(this.ruleForm.activity_start).valueOf();
           }
         },
       },
@@ -561,12 +529,10 @@ export default {
         activity_end: end || "",
         activity_desc: activity_desc || "",
         is_stock: is_stock || "",
-        good_list:
-          info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [],
+        good_list: info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [],
       };
       this.status = status || "";
-      this.tableData =
-        info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [];
+      this.tableData = info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [];
     },
     handleClick(row) {
       console.log(row);
@@ -624,8 +590,7 @@ export default {
             this.loading = false;
             const { code, data, message } = res;
             if (code === 0) {
-              const title =
-                this.type === "add" ? "新建成功！" : "库存修改成功!";
+              const title = this.type === "add" ? "新建成功！" : "库存修改成功!";
               this.$notify.success({
                 title: title,
                 message: "",
@@ -647,6 +612,18 @@ export default {
                 dangerouslyUseHTMLString: true,
                 message: htmlList,
               });
+            } else if (code == 1007) {
+              let resList = JSON.parse(JSON.stringify(data));
+              let htmlList = "<ul>";
+              resList.forEach((v) => {
+                htmlList += `<li>${v}</li>`;
+              });
+              htmlList += "</ul>";
+              this.$notify({
+                title: message,
+                dangerouslyUseHTMLString: true,
+                message: htmlList,
+              });
             } else {
               this.$message.warning(message);
             }
@@ -668,7 +645,7 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .activeAdd {
   .activeAdd-title {
     border-top: 1px solid #ebeef5;
@@ -701,4 +678,3 @@ export default {
   }
 }
 </style>
-   

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-model.vue

@@ -32,7 +32,6 @@
                   label="可入库总数"
                   prop="wsend_num"
                   required
-                  
                   label-width="95px"
                 >
                   <el-input
@@ -68,9 +67,7 @@
                     v-model="ruleForm.sendtype"
                     style="width: 100%"
                     :size="'mini'"
-                    :disabled="
-                      (sitem && sitem.order_type === '3') 
-                    "
+                    :disabled="sitem && sitem.order_type === '3'"
                     placeholder="发货方式"
                     @change="sendtypeChange"
                   >
@@ -107,6 +104,7 @@
                     :value="ruleForm.post_company"
                     :placeholder="'物流公司'"
                     :names="''"
+                    :order_source="order_source"
                     :size="'mini'"
                     :is-detail="false"
                     @searchChange="handleCompany"
@@ -151,7 +149,7 @@
     </el-card>
   </el-dialog>
 </template>
-   <script>
+<script>
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import { isAlphanumeric } from "@/utils/validate";
@@ -200,6 +198,7 @@ export default {
     return {
       showModelThis: this.showModel,
       loading: true,
+      order_source: "",
       ruleForm: {
         wsm_mobile: "",
         wsm_contactor: "",
@@ -304,8 +303,9 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { cgdNo, wsend_num, goodinfo } = this.sitem;
+          const { cgdNo, wsend_num, goodinfo, order_source } = this.sitem;
           const { send_way } = goodinfo;
+          this.order_source = order_source || "";
           this.ruleForm = {
             wsm_mobile: "",
             wsm_contactor: "",
@@ -338,9 +338,9 @@ export default {
       console.log(this.rules);
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
-           if (this.loading) {
-        return;
-      }
+          if (this.loading) {
+            return;
+          }
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           model.post_company = model.post_company.toString();
@@ -381,8 +381,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .purchaseOrder {
 }
 </style>
-   

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-return-form.vue

@@ -24,11 +24,10 @@
       <el-col :span="6">
         <el-form-item label="物流公司" prop="post_company">
           <search-express
-            :disabled="
-              !(status === '5' && powers.some((item) => item == '032'))
-            "
+            :disabled="!(status === '5' && powers.some((item) => item == '032'))"
             :value="ruleForm.post_company"
             :placeholder="'物流公司'"
+            :order_source="'0'"
             :names="''"
             :size="'mini'"
             :is-detail="false"
@@ -40,9 +39,7 @@
         <el-form-item label="物流单号" prop="post_code">
           <el-input
             placeholder="物流单号"
-            :disabled="
-              !(status === '5' && powers.some((item) => item == '032'))
-            "
+            :disabled="!(status === '5' && powers.some((item) => item == '032'))"
             v-model="ruleForm.post_code"
             maxlength="100"
           >
@@ -220,7 +217,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .stockInDetail {
   .el-table-column-error_img-ul {
     position: relative;

src/views/sellOut/returnOrder/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="returnOrder pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div v-if="powers && powers.length > 0 && powers.some((item) => item == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -44,6 +42,7 @@
                   :value="parmValue.post_compay"
                   :placeholder="'物流公司'"
                   :names="parmValue.supplierName_cp"
+                  :order_source="''"
                   :is-detail="true"
                   @searchChange="handleCompany"
                 />
@@ -145,8 +144,8 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              (statusList.find((item) => item.value == scope.row.status) || {})
-                .label || '--'
+              (statusList.find((item) => item.value == scope.row.status) || {}).label ||
+              '--'
             "
           ></el-tag>
         </template>
@@ -159,7 +158,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="getRouter('returnOrderDetail', scope.row.thNo )"
+              @click="getRouter('returnOrderDetail', scope.row.thNo)"
             ></i>
           </el-tooltip>
         </template>
@@ -178,7 +177,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import columns from "./columns";
@@ -196,9 +195,8 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "returnOrder"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "returnOrder") ||
+        {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {
@@ -233,7 +231,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        order_type: "", 
+        order_type: "",
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
@@ -244,7 +242,7 @@ export default {
         end: "", //
         status: "", //状态节点
         customer_code: "", //退货客户编号
-        supplierName:'',
+        supplierName: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -267,38 +265,36 @@ export default {
     };
   },
   mounted() {
-     const { back } = this.$route.query;
+    const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue)
-      const {page,size}=this.parmValue;
+      console.log(this.parmValue);
+      const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
-      console.log("11111",this.parmValue.customer_code)
-      if(this.parmValue.customer_code.length>0){
-          this.customerCode = [this.parmValue.customer_code] ;
+      console.log("11111", this.parmValue.customer_code);
+      if (this.parmValue.customer_code.length > 0) {
+        this.customerCode = [this.parmValue.customer_code];
       }
-      
-      
-       this.pageInfo= {
+
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    this.select = this.parmValue.select;
-    // this.sselect = this.parmValue.sselect;
-    this.s_input = this.parmValue.s_input
-
-    }else{
-       this.select = "returnNo";
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.s_input = this.parmValue.s_input;
+    } else {
+      this.select = "returnNo";
       //  this.sselect = "创建时间"
     }
     this.searchList();
   },
 
   methods: {
-    getRouter(toRouter, queryId){
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
@@ -306,17 +302,17 @@ export default {
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select ;
+        this.parmValue.select = this.select;
         // this.parmValue.sselect = this.sselect ;
-        this.parmValue.s_input= this.s_input;
+        this.parmValue.s_input = this.s_input;
         //
-        console.log(this.parmValue)
-         let routerModel = {
+        console.log(this.parmValue);
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -335,8 +331,8 @@ export default {
         start: "", //
         end: "", //
         status: "", //状态节点
-        supplierName:'',
-        order_type: "", 
+        supplierName: "",
+        order_type: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -357,19 +353,18 @@ export default {
     },
     // 客户选择
     async customerChange(e) {
-      const {code,label}=e
-        this.customerCode =code? [code]:[];
-        this.parmValue.supplierName =label||"" ;
-        this.parmValue.customer_code = code||"";
-        
-      
-      console.log(this.parmValue)
+      const { code, label } = e;
+      this.customerCode = code ? [code] : [];
+      this.parmValue.supplierName = label || "";
+      this.parmValue.customer_code = code || "";
+
+      console.log(this.parmValue);
       this.pageInfo.curr = 1;
       this.parmValue.page = 1;
       await this.searchList();
     },
     async searchList() {
-       if (
+      if (
         (this.parmValue.start !== "" && this.parmValue.end === "") ||
         (this.parmValue.start === "" && this.parmValue.end !== "")
       ) {
@@ -377,12 +372,9 @@ export default {
         return;
       }
       this.loading = true;
-      this.parmValue.post_code =
-        this.select === "expressNo" ? this.s_input : "";
-     this.parmValue.return_code =
-        this.select === "serviceNo" ? this.s_input : "";
-      this.parmValue.out_code =
-        this.select === "outOrderNo" ? this.s_input : "";
+      this.parmValue.post_code = this.select === "expressNo" ? this.s_input : "";
+      this.parmValue.return_code = this.select === "serviceNo" ? this.s_input : "";
+      this.parmValue.out_code = this.select === "outOrderNo" ? this.s_input : "";
       this.parmValue.thNo = this.select === "returnNo" ? this.s_input : "";
       this.parmValue.order_code = this.select === "orderNo" ? this.s_input : "";
       let model = JSON.parse(JSON.stringify(this.parmValue));
@@ -402,9 +394,8 @@ export default {
 
     //物流公司查询
     async handleCompany(e) {
-      
       this.parmValue.post_compay = e && e.code ? [e.label] : [];
-      
+
       this.parmValue.supplierName_cp = e.label;
       this.pageInfo.curr = 1;
       this.parmValue.page = 1;
@@ -426,6 +417,4 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
-</style>
-   
+<style lang="scss" scoped></style>

src/views/sellOut/sellOutOrder/components/logisticsForm.vue

@@ -25,6 +25,7 @@
             :value="ruleForm.post_name"
             :placeholder="'物流公司'"
             :names="''"
+            :order_source="order_source"
             :is-detail="false"
             @searchChange="handleCompany"
           />
@@ -32,20 +33,12 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="物流单号" prop="post_code">
-          <el-input
-            placeholder="物流单号"
-            v-model="ruleForm.post_code"
-            maxlength="100"
-          />
+          <el-input placeholder="物流单号" v-model="ruleForm.post_code" maxlength="100" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="物流费用" prop="post_fee">
-          <el-input
-            placeholder="物流费用"
-            v-model="ruleForm.post_fee"
-            maxlength="100"
-          >
+          <el-input placeholder="物流费用" v-model="ruleForm.post_fee" maxlength="100">
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
@@ -56,9 +49,7 @@
         style="text-align: right"
         v-if="powers.some((item) => item == '045')"
       >
-        <el-button type="primary" :size="'mini'" @click="submitForm"
-          >保 存
-        </el-button>
+        <el-button type="primary" :size="'mini'" @click="submitForm">保 存 </el-button>
       </el-col>
     </el-row>
   </el-form>
@@ -111,6 +102,7 @@ export default {
     };
 
     return {
+      order_source: "",
       loading: true,
       ruleForm: {
         outCode: "",
@@ -164,8 +156,15 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
 
-          const { outCode, send_num, post_code, post_name, post_fee } =
-            this.sitem;
+          const {
+            outCode,
+            send_num,
+            post_code,
+            post_name,
+            post_fee,
+            order_source,
+          } = this.sitem;
+          this.order_source = order_source;
           this.ruleForm = {
             outCode: outCode || "",
             send_num: send_num || "",
@@ -221,7 +220,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .account {
 }
 </style>

src/views/sellOut/sellOutOrder/components/returnExpress.vue

@@ -17,6 +17,7 @@
             :value="ruleForm.express_company"
             :placeholder="'物流公司'"
             :names="''"
+            :order_source="order_source"
             :size="'mini'"
             :disabled="false"
             :is-detail="false"
@@ -103,6 +104,7 @@ export default {
         },
       ],
       returnCode: "",
+      order_source: "",
       code: "",
       isShow: false,
       loading: false,
@@ -148,9 +150,8 @@ export default {
   computed: {
     powers() {
       let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchase_check"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "purchase_check") ||
+        {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {
@@ -206,8 +207,15 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { returnCode, is_th, company, post_code, post_fee } =
-            this.sitem;
+          const {
+            returnCode,
+            is_th,
+            company,
+            post_code,
+            post_fee,
+            order_source,
+          } = this.sitem;
+          this.order_source = order_source;
           this.is_th = is_th;
           this.returnCode = returnCode;
           this.ruleForm = {
@@ -279,5 +287,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/sellOut/sellOutOrder/components/want-deliver.vue

@@ -56,6 +56,7 @@
                 :placeholder="'物流公司'"
                 :names="''"
                 :size="'mini'"
+                :order_source="order_source"
                 :is-detail="false"
                 @searchChange="handleCompany"
               /> </el-form-item
@@ -141,6 +142,7 @@ export default {
 
     return {
       loading: true,
+      order_source: "",
       const_post: {
         required: true,
         validator: validateCode,
@@ -230,7 +232,9 @@ export default {
             post_name,
             post_fee,
             remark,
+            order_source,
           } = this.sitem;
+          this.order_source = order_source;
           this.ruleForm = {
             outCode: outCode || "",
             send_num: send_num || "",

src/views/stock/allot/components/goStock-audit.vue

@@ -15,9 +15,8 @@
             :names="''"
             :size="'mini'"
             :disabled="!(status == '2' && powers.some((item) => item == '021'))"
-            :is-detail="
-              !(status == '2' && powers.some((item) => item == '021'))
-            "
+            :order_source="''"
+            :is-detail="!(status == '2' && powers.some((item) => item == '021'))"
             @searchChange="handleCompany"
           />
         </el-form-item>
@@ -64,7 +63,7 @@
     </el-row>
   </el-form>
 </template>
-   <script>
+<script>
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/stock/allot/detail";
 import { isAlphanumeric, isnumber2 } from "@/utils/validate";
@@ -75,9 +74,8 @@ export default {
   computed: {
     powers() {
       let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "allotDetail"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "allotDetail") ||
+        {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {

src/views/youzan/othOrderCancelLog/index.vue

@@ -108,12 +108,6 @@ export default {
   data() {
     return {
       loading: false,
-      sitem: {},
-      showRateModel: false,
-      modelRateId: "000",
-      sitemRate: {},
-      select: "1",
-      sinput: "",
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -172,31 +166,6 @@ export default {
         await this.searchList();
       }
     },
-    //点击详情
-    getRouter(toRouter, queryId) {
-      if (toRouter && queryId) {
-        let model = {
-          id: queryId,
-          type: "view",
-        };
-
-        //有多选框的条件
-        this.parmValue.select = this.select;
-        // this.parmValue.sselect = this.sselect ;
-        this.parmValue.sinput = this.sinput;
-        //
-        console.log(this.parmValue);
-        let routerModel = {
-          options: JSON.parse(JSON.stringify(this.parmValue)),
-          router: this.$route.path,
-        };
-        model.preModel = JSON.stringify(routerModel);
-
-        this.routeGoto(toRouter, model);
-      } else {
-        this.$message.warning("暂未找到相关流程！");
-      }
-    },
     // 刷新表格
     async searchList() {
       if (this.loading) return;

src/views/youzan/othOrderModifyAddressLog/index.vue

@@ -117,12 +117,6 @@ export default {
   data() {
     return {
       loading: false,
-      sitem: {},
-      showRateModel: false,
-      modelRateId: "000",
-      sitemRate: {},
-      select: "1",
-      sinput: "",
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -182,31 +176,6 @@ export default {
         await this.searchList();
       }
     },
-    //点击详情
-    getRouter(toRouter, queryId) {
-      if (toRouter && queryId) {
-        let model = {
-          id: queryId,
-          type: "view",
-        };
-
-        //有多选框的条件
-        this.parmValue.select = this.select;
-        // this.parmValue.sselect = this.sselect ;
-        this.parmValue.sinput = this.sinput;
-        //
-        console.log(this.parmValue);
-        let routerModel = {
-          options: JSON.parse(JSON.stringify(this.parmValue)),
-          router: this.$route.path,
-        };
-        model.preModel = JSON.stringify(routerModel);
-
-        this.routeGoto(toRouter, model);
-      } else {
-        this.$message.warning("暂未找到相关流程！");
-      }
-    },
     // 刷新表格
     async searchList() {
       if (this.loading) return;

src/views/youzan/othTransferOrderLog/index.vue

@@ -23,7 +23,7 @@
       >
         <template #table-header="{}">
           <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
+            <el-row style="padding: 0 0 10px 80px">
               <el-col :span="4" style="width: 140px">
                 <el-select
                   v-model="parmValue.status"
@@ -39,10 +39,10 @@
                   "
                 >
                   <el-option
-                    v-for="item in statusList"
-                    :key="'status' + item.id"
+                    v-for="item in status_list"
+                    :key="'status' + item.value"
                     :label="item.label"
-                    :value="item.id"
+                    :value="item.value"
                   />
                 </el-select>
               </el-col>
@@ -56,36 +56,19 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col :span="4" style="width: 322px; padding: 0 0 0 10px">
-                <!-- <el-input
-                  :size="searchSize"
-                  v-model="sinput"
-                  :maxlength="40"
-                  @blur="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                  placeholder="关键字"
-                  ><el-select
-                    v-model="select"
-                    slot="prepend"
-                    :size="searchSize"
-                    style="width: 140px"
-                    @change="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                    placeholder="关键字类型"
-                  >
-                    <el-option label="平台订单号" value="1" />
-                    <el-option label="平台商品编号" value="2" />
-                    <el-option label="销售订单号" value="3" />
-                    <el-option label="线上商品编号" value="4" />
-                    <el-option label="所属平台" value="5" /></el-select
-                ></el-input> -->
-
+              <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+                <el-button type="primary" :size="searchSize" @click="searchList">
+                  刷新
+                </el-button>
+              </el-col>
+              <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+                <el-button type="warning" :size="searchSize" @click="restSearch">
+                  重置
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-row style="width: 100%">
+              <el-col :span="4" style="width: 480px">
                 <el-input
                   :size="searchSize"
                   v-model="sinput"
@@ -96,40 +79,29 @@
                     searchList();
                   "
                   placeholder="关键字"
-                  ><el-select
-                    v-model="select"
-                    slot="prepend"
-                    :size="searchSize"
+                >
+                  <el-select
+                    v-model="elSelect"
                     style="width: 140px"
+                    slot="prepend"
+                    placeholder="关键字类型"
                     @change="
                       pageInfo.curr = 1;
                       parmValue.page = 1;
                       searchList();
                     "
-                    placeholder="关键字类型"
                   >
-                    <el-option label="平台订单号" value="1" />
-                    <el-option label="平台商品编号" value="2" />
-                    <el-option label="销售订单号" value="3" />
-                    <el-option label="线上商品编号" value="4" />
-                    <!-- <el-option label="所属平台" value="5" /> -->
-                  </el-select></el-input
-                >
-              </el-col>
-
-              <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-                <el-button type="primary" :size="searchSize" @click="searchList">
-                  刷新
-                </el-button>
-              </el-col>
-              <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-                <el-button type="warning" :size="searchSize" @click="restSearch">
-                  重置
-                </el-button>
+                    <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-option label="所属平台" value="5"></el-option> -->
+                  </el-select>
+                </el-input>
               </el-col>
             </el-row>
-          </div></template
-        >
+          </div>
+        </template>
         <template #expand="{ scope }">
           <el-form label-position="left" inline :size="'mini'">
             <el-row>
@@ -212,7 +184,6 @@ import { columns, pay_type_list, status_list } from "./columns";
 export default {
   name: "othTransferOrderLog",
   mixins: [mixinPage, resToken],
-
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -230,14 +201,9 @@ export default {
   },
   data() {
     return {
-      status_list,
-      loading: false,
-      sitem: {},
-      showRateModel: false,
-      modelRateId: "000",
-      sitemRate: {},
-      select: "1",
+      elSelect: "1",
       sinput: "",
+      loading: false,
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -267,15 +233,15 @@ export default {
       // 表格 - 列参数
       columns,
       pay_type_list,
+      status_list,
     };
   },
   mounted() {
-    this.select = "1";
     this.searchList();
   },
   methods: {
     restSearch() {
-      this.select = "1";
+      this.elSelect = "1";
       this.sinput = "";
       // 表格 - 分页
       this.pageInfo = {
@@ -318,9 +284,9 @@ export default {
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select;
-        // this.parmValue.sselect = this.sselect ;
-        this.parmValue.sinput = this.sinput;
+        // this.parmValue.elSelect = this.elSelect;
+        // // this.parmValue.selSelect = this.selSelect ;
+        // this.parmValue.sinput = this.sinput;
         //
         console.log(this.parmValue);
         let routerModel = {
@@ -359,23 +325,15 @@ export default {
         return;
       }
       this.loading = true;
-      this.parmValue.oid = this.select = "1" ? this.sinput : "";
-      this.parmValue.plat_code = this.select = "1" ? this.sinput : "";
-      this.parmValue.orderCode = this.select = "1" ? this.sinput : "";
-      this.parmValue.skuCode = this.select = "1" ? this.sinput : "";
-      this.parmValue.platform_name = this.select = "1" ? this.sinput : "";
+      this.parmValue.oid = this.elSelect = "1" ? this.sinput : "";
+      this.parmValue.plat_code = this.elSelect = "2" ? this.sinput : "";
+      this.parmValue.orderCode = this.elSelect = "3" ? this.sinput : "";
+      this.parmValue.skuCode = this.elSelect = "4" ? this.sinput : "";
+      // this.parmValue.platform_name = this.elSelect = "1" ? this.sinput : "";
       const { code, data } = await asyncRequest.list(this.parmValue);
       if (code === 0) {
         const { list, count } = data ?? {};
-
-        let arr = list ?? [];
-        arr.map((e) => {
-          for (let key in e.data) {
-            e[`key_${key}`] = e.data[key];
-          }
-          return e;
-        });
-        this.tableData = arr;
+        this.tableData = list ?? [];
         this.pageInfo.total = count ?? 0;
       } else if (code >= 100 && code <= 104) {
         await this.logout();