Prechádzať zdrojové kódy

Merge branch 'v3.0' into company

snow 1 rok pred
rodič
commit
6cbe931e44

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/0.js


+ 2 - 2
src/views/purchaseIn/deliveryWorkOrder/components/ShowDataTableColumns.js

@@ -77,12 +77,12 @@ const showColumns = [
     span: 12
   },
   {
-    prop: 'contactor',
+    prop: 'addr_contactor',
     label: '收货人',
     span: 8
   },
   {
-    prop: 'mobile',
+    prop: 'addr_mobile',
     label: '收货电话',
     span: 8
   },

+ 70 - 66
src/views/purchaseIn/deliveryWorkOrder/index.vue

@@ -38,7 +38,7 @@
                     searchList();
                   "
                 />
-              </el-col> -->
+              </el-col>-->
               <!-- 时间区间 -->
               <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
                 <period-date-picker
@@ -64,12 +64,18 @@
               </el-col>
 
               <el-col :span="4">
-                <el-input style="width:100%" clearable size="mini" placeholder="商品名称" v-model="parmValue.good_name"  
-                @change="
+                <el-input
+                  style="width:100%"
+                  clearable
+                  size="mini"
+                  placeholder="商品名称"
+                  v-model="parmValue.good_name"
+                  @change="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
-                  " />
+                  "
+                />
               </el-col>
 
               <el-col :span="3" style="width: 66px; float: right">
@@ -78,9 +84,7 @@
                   type="primary"
                   style="float: right; margin-left: 5px"
                   @click="searchList"
-                >
-                  刷新
-                </el-button>
+                >刷新</el-button>
               </el-col>
             </el-row>
 
@@ -166,18 +170,11 @@
                 />
               </el-col>
               <el-col :span="4" class="fr" style="width: 66px; padding: 0 0 0 10px">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
+                <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
               </el-col>
             </el-row>
 
-            <el-row style="padding: 10px 0 0 0">              
+            <el-row style="padding: 10px 0 0 0">
               <el-col :span="6" style="width: 502px;margin-left: 0px;">
                 <el-input
                   clearable
@@ -212,13 +209,19 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              
+
               <el-col :span="5">
-                <el-select size="mini" style="width:104%;margin-left: 10px;" placeholder=""  v-model="parmValue.IsByMe" @change="
+                <el-select
+                  size="mini"
+                  style="width:104%;margin-left: 10px;"
+                  placeholder
+                  v-model="parmValue.IsByMe"
+                  @change="
                       pageInfo.curr = 1;
                       parmValue.page = 1;
                       searchList();
-                    ">
+                    "
+                >
                   <el-option label="与我相关" value="0" />
                   <el-option label="由我执行" value="1" />
                 </el-select>
@@ -230,15 +233,12 @@
                   type="primary"
                   size="mini"
                   @click="routeGoto('deliveryWorkOrderSend')"
-                  >批量发货</el-button
-                >
+                >批量发货</el-button>
               </div>
 
               <!-- v-if="powers.includes('087') && !isSupertube" -->
-              <div style="float: right" >
-                <el-button type="primary" size="mini" @click="handleExport"
-                  >发货工单导出</el-button
-                >
+              <div style="float: right">
+                <el-button type="primary" size="mini" @click="handleExport">发货工单导出</el-button>
               </div>
               <!-- <el-col :span="4" style="margin-left: 10px;margin-top:10px">
                   <el-select placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
@@ -251,7 +251,7 @@
                     <el-option value="0" label="未开通" />
                     <el-option value="1" label="已开通"/>
                   </el-select>
-                </el-col> -->
+              </el-col>-->
             </el-row>
           </div>
         </template>
@@ -269,8 +269,8 @@
         <template #use_type="{ scope }">
           <el-tag size="mini">
             {{
-              (usetypeOtions.find(({ value }) => value === scope.row.use_type) || {})
-                .label || "---"
+            (usetypeOtions.find(({ value }) => value === scope.row.use_type) || {})
+            .label || "---"
             }}
           </el-tag>
         </template>
@@ -351,7 +351,7 @@ import {
   xs_order_type_options,
   xs_order_source_options,
   has_account_list,
-  usetypeOtions,
+  usetypeOtions
 } from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper";
 
@@ -363,7 +363,7 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "deliveryWorkOrder"
+          item => item.menu_route == "deliveryWorkOrder"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];
@@ -371,11 +371,11 @@ export default {
     dpowers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "deliveryWorkOrderDetail"
+          item => item.menu_route == "deliveryWorkOrderDetail"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];
-    },
+    }
   },
   data() {
     return {
@@ -383,7 +383,7 @@ export default {
       xs_order_source_options,
       has_account_list,
       usetypeOtions,
-      supplierName:"",
+      supplierName: "",
       fileUrl: urlConfig.baseURL,
       select: "outChildCode", //默认选择下拉框
       s_input: "", //搜索框内容
@@ -395,18 +395,18 @@ export default {
         { value: "2", label: "发货完成" },
         // { value: "3", label: "已收货" },
         // { value: "4", label: "已全部收货" },
-        { value: "5", label: "已取消" },
+        { value: "5", label: "已取消" }
       ],
       loading: false,
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
-        good_name:'',
-        IsByMe:"1",
-        supplierName:"",
-        supplierNo:"",
-        customerName:"",
+        good_name: "",
+        IsByMe: "1",
+        supplierName: "",
+        supplierNo: "",
+        customerName: "",
         status: "",
         has_account: "",
         customer_code: [],
@@ -422,7 +422,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         order_type: "",
-        use_type: "1",
+        use_type: "1"
       },
       tableData: [],
       passwordModel: false,
@@ -434,16 +434,16 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ["setcol"]
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格 - 列参数
-      columns: columns,
+      columns: columns
     };
   },
   mounted() {
@@ -460,7 +460,7 @@ export default {
       this.pageInfo = {
         size: size,
         curr: page,
-        total: 0,
+        total: 0
       };
       //多选条件
       this.select = this.parmValue.select;
@@ -483,10 +483,10 @@ export default {
     customer_code_change(e) {
       if (e && e.code) {
         this.parmValue.customer_code = [e.code];
-        this.parmValue.customerName = e.label
+        this.parmValue.customerName = e.label;
       } else {
         this.parmValue.customer_code = [];
-        this.parmValue.customerName = ""
+        this.parmValue.customerName = "";
       }
       this.searchList();
     },
@@ -511,13 +511,13 @@ export default {
             supplierNo: Array.isArray(this.parmValue.supplierNo)
               ? this.parmValue.supplierNo[0]
               : this.parmValue.supplierNo,
-            needRela: true,
+            needRela: true
           },
           headers: {
-            Accept: httpType,
-          },
+            Accept: httpType
+          }
         })
-          .then((res) => {
+          .then(res => {
             if (res && res.status == 200 && res.data) {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], { type: httpType })
@@ -542,7 +542,7 @@ export default {
               }, 500);
             }
           })
-          .catch((error) => {
+          .catch(error => {
             console.log(error);
             this.loading = false;
           });
@@ -555,7 +555,7 @@ export default {
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
-          id: queryId,
+          id: queryId
         };
 
         //有多选框的条件
@@ -564,7 +564,7 @@ export default {
         this.parmValue.s_input = this.s_input;
         let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
-          router: this.$route.path,
+          router: this.$route.path
         };
         model.preModel = JSON.stringify(routerModel);
         this.routeGoto(toRouter, model);
@@ -574,8 +574,8 @@ export default {
       this.s_input = ""; //清除输入框内容
       this.select = "outChildCode"; //清除下拉框选中项
       this.parmValue = {
-        good_name:'',
-        IsByMe:"1",
+        good_name: "",
+        IsByMe: "1",
         order_type: "",
         company_name: "", //申请人部门
         good_code: "",
@@ -587,14 +587,14 @@ export default {
         status: "", //节点状态
         page: 1, // 页码
         size: 15, // 每页显示条数
-        use_type: "1",
+        use_type: "1"
       };
 
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         total: 0,
-        curr: 1,
+        curr: 1
       };
 
       this.searchList();
@@ -610,18 +610,18 @@ export default {
       await this.$confirm("确定要删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           const model = {
             id: id,
-            status: status + "" === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1"
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.$notify.success({
               title: "删除成功",
-              message: "",
+              message: ""
             });
             this.searchList();
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -644,9 +644,11 @@ export default {
       }
       this.loading = true;
 
-      let {supplierName,customerName,...model} = JSON.parse(JSON.stringify(this.parmValue));
+      let { supplierName, customerName, ...model } = JSON.parse(
+        JSON.stringify(this.parmValue)
+      );
       delete model["s_input"];
-      delete model['use_type']
+      delete model["use_type"];
 
       const res = await asyncRequest.list({
         ...model,
@@ -654,8 +656,10 @@ export default {
         customer_code: Array.isArray(this.parmValue.customer_code)
           ? this.parmValue.customer_code[0]
           : this.parmValue.customer_code,
-        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo,
-        needRela: true,
+        supplierNo: Array.isArray(this.parmValue.supplierNo)
+          ? this.parmValue.supplierNo[0]
+          : this.parmValue.supplierNo,
+        needRela: true
       });
 
       if (res && res.code === 0 && res.data) {
@@ -702,8 +706,8 @@ export default {
         this.parmValue.page = 1;
         await this.searchList();
       }
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

+ 2 - 2
src/views/supplierPurchaseIn/supplierDeliveryWorkOrder/components/ShowDataTableColumns.js

@@ -77,12 +77,12 @@ const showColumns = [
     span: 12
   },
   {
-    prop: 'contactor',
+    prop: 'addr_contactor',
     label: '收货人',
     span: 8
   },
   {
-    prop: 'mobile',
+    prop: 'addr_mobile',
     label: '收货电话',
     span: 8
   },

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov