xiaodai2022 2 years ago
parent
commit
3ac8ff3aaa

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-elementUI.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-libs.js


+ 180 - 48
src/views/sellOut/sellOutOrder/index.vue

@@ -1,62 +1,150 @@
 <template>
   <div class="sellOutOrder pagePadding">
     <div v-if="powers.some((i) => i == '001')">
-      <ex-table v-loading="loading" :table="table" :data="tableData" :columns="columns" :page="pageInfo" :size="size"
-        @page-curr-change="handlePageChange" @page-size-change="handleSizeChange" @screen-reset="
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
           pageInfo.curr = 1;
           parmValue.page = 1;
           searchList();
-        " @screen-submit="
+        "
+        @screen-submit="
           pageInfo.curr = 1;
           parmValue.page = 1;
           searchList();
-        " @selection="selection_change">
+        "
+        @selection="selection_change"
+      >
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="4" style="width: 375px; display: flex; align-items: center">
                 <p style="margin-right: 10px">添加时间:</p>
-                <period-date-picker :type="1" :start="parmValue.start" :end="parmValue.end" :width="'134px'"
-                  :size="searchSize" @timeReturned="handleTime" />
+                <period-date-picker
+                  :type="1"
+                  :start="parmValue.start"
+                  :end="parmValue.end"
+                  :width="'134px'"
+                  :size="searchSize"
+                  @timeReturned="handleTime"
+                />
               </el-col>
               <el-col :span="4" style="width: 375px; display: flex; align-items: center">
                 <p style="margin-right: 10px">发货时间:</p>
-                <period-date-picker :type="1" :start="parmValue.start_sendtime" :end="parmValue.end_sendtime"
-                  :width="'134px'" :size="searchSize" @timeReturned="handleTime($event, true)" />
+                <period-date-picker
+                  :type="1"
+                  :start="parmValue.start_sendtime"
+                  :end="parmValue.end_sendtime"
+                  :width="'134px'"
+                  :size="searchSize"
+                  @timeReturned="handleTime($event, true)"
+                />
               </el-col>
 
               <el-col :span="4" style="width: 230px; padding: 0px 0 0 10px">
-                <search-customer :value="customerCode" :size="searchSize" :placeholder="'客户公司名称'"
-                  :names="parmValue.supplierName" :is-detail="true" @searchChange="customerChange" />
+                <search-customer
+                  :value="customerCode"
+                  :size="searchSize"
+                  :placeholder="'客户公司名称'"
+                  :names="parmValue.supplierName"
+                  :is-detail="true"
+                  @searchChange="customerChange"
+                />
               </el-col>
 
               <el-col :span="3" style="width: 66px; float: right">
-                <el-button :size="searchSize" type="primary" style="float: right; margin-left: 5px" @click="searchList">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  style="float: right; margin-left: 5px"
+                  @click="searchList"
+                >
                   刷新
                 </el-button>
               </el-col>
-              <el-col :span="4" style="width: 66px; float: right" v-if="powers.some((i) => i == '087')">
-                <el-button type="primary" style="margin-left: 30px" @click="download" :size="searchSize" class="fr">
+              <el-col
+                :span="4"
+                style="width: 66px; float: right"
+                v-if="powers.some((i) => i == '087')"
+              >
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="download"
+                  :size="searchSize"
+                  class="fr"
+                >
                   导出
                 </el-button>
               </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
               <el-col :span="4" style="width: 150px">
-                <el-select :size="searchSize" v-model="parmValue.status" filterable clearable placeholder="状态"
-                  style="width: 100%" @change="
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.status"
+                  filterable
+                  clearable
+                  placeholder="状态"
+                  style="width: 100%"
+                  @change="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
-                  ">
-                  <el-option v-for="item in statusOptions" :key="'status' + item.id" :label="item.label"
-                    :value="item.id" />
+                  "
+                >
+                  <el-option
+                    v-for="item in statusOptions"
+                    :key="'status' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_type"
+                  filterable
+                  clearable
+                  placeholder="商品来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_type_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
                 </el-select>
               </el-col>
               <el-col :span="4" style="width: 500px; padding: 0 0 0 10px">
-                <el-input clearable :size="searchSize" placeholder="关键字" v-model="s_input" maxlength="40"
-                  class="input-with-select">
-                  <el-select style="width: 140px" v-model="select" slot="prepend" placeholder="关键字类型">
+                <el-input
+                  clearable
+                  :size="searchSize"
+                  placeholder="关键字"
+                  v-model="s_input"
+                  maxlength="40"
+                  class="input-with-select"
+                >
+                  <el-select
+                    style="width: 140px"
+                    v-model="select"
+                    slot="prepend"
+                    placeholder="关键字类型"
+                  >
                     <el-option label="销售订单编号" value="orderCode" />
                     <el-option label="发货申请单编号" value="outCode" />
                     <el-option label="供应商名称" value="supplier_name" />
@@ -66,22 +154,40 @@
                     <el-option label="申请人" value="apply_name" />
                     <el-option label="采购单编号" value="cgdNo" />
                   </el-select>
-                  <el-button slot="append" icon="el-icon-search" @click="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    handleValue();
-                  "></el-button>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      handleValue();
+                    "
+                  ></el-button>
                 </el-input>
               </el-col>
               <el-col :span="4" style="width: 66px" class="fr">
-                <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">
+                <el-button
+                  type="warning"
+                  class="fr"
+                  :size="searchSize"
+                  @click="restSearch"
+                >
                   重置
                 </el-button>
               </el-col>
 
-              <el-col :span="4" style="width: 66px; float: right" v-if="powers.some((i) => i == '090')">
-                <el-button type="primary" style="margin-left: 30px" @click="routeGoto('sendOutOrder', {})"
-                  :size="searchSize" class="fr">
+              <el-col
+                :span="4"
+                style="width: 66px; float: right"
+                v-if="powers.some((i) => i == '090')"
+              >
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="routeGoto('sendOutOrder', {})"
+                  :size="searchSize"
+                  class="fr"
+                >
                   批量发货
                 </el-button>
               </el-col>
@@ -89,31 +195,57 @@
           </div>
         </template>
         <template #status="{ scope }">
-          <el-tag :size="tablebtnSize" :type="scope.row.status == '0' ? 'warning' : ''" v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
-            '--'
-          "></el-tag>
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              '--'
+            "
+          ></el-tag>
         </template>
         <template #order_type="{ scope }">
-          <el-tag :size="tablebtnSize" v-text="
-            (
-              xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
-              {}
-            ).label || '--'
-          "></el-tag>
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
         </template>
 
         <template #operation="{ scope }">
-          <el-tooltip v-if="powers.some((i) => i == '007')" effect="dark" content="详情" placement="top">
-            <i class="el-icon-view tb-icon" @click="getRouter('sellOutOrderDetail', scope.row.outCode)"></i>
+          <el-tooltip
+            v-if="powers.some((i) => i == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="getRouter('sellOutOrderDetail', scope.row.outCode)"
+            ></i>
           </el-tooltip>
-          <el-tooltip v-if="Number(scope.row.status) >= 2" effect="dark" content="分享" placement="top">
+          <el-tooltip
+            v-if="Number(scope.row.status) >= 2"
+            effect="dark"
+            content="分享"
+            placement="top"
+          >
             <i class="el-icon-share tb-icon" @click="handleShare(scope.row.outCode)"></i>
           </el-tooltip>
         </template>
       </ex-table>
-      <add-edit :id="modelId" :sitem="sitem" :show-model="showModel" :is-detail="isDetail" @refresh="searchList"
-        @cancel="showModel = false" />
+      <add-edit
+        :id="modelId"
+        :sitem="sitem"
+        :show-model="showModel"
+        :is-detail="isDetail"
+        @refresh="searchList"
+        @cancel="showModel = false"
+      />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -182,7 +314,6 @@ export default {
         end: "",
         start_sendtime: "",
         end_sendtime: "",
-
         supplier_name: "",
         companyNo: "",
         good_code: "",
@@ -520,7 +651,7 @@ export default {
     async handleValue() {
       this.parmValue.orderCode = this.select === "orderCode" ? this.s_input : "";
       this.parmValue.outCode = this.select === "outCode" ? this.s_input : "";
-      this.parmValue.supplier_name = this.select === 'supplier_name' ? this.s_input : "";
+      this.parmValue.supplier_name = this.select === "supplier_name" ? this.s_input : "";
 
       // this.parmValue.supplierName =
       //   this.select === "supplierNo" ? this.s_input : "";
@@ -536,5 +667,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.zxoutOrder {}
+.zxoutOrder {
+}
 </style>

Some files were not shown because too many files changed in this diff