15

src/views/order/orderList/component/ordermis.vue

@@ -91,7 +91,8 @@
             <el-select
               filterable
               allow-create
-              v-model="form.paperName">
+              v-model="form.paperName"
+            @input.native="selectBlur1($event)">
               <el-option
                 v-for="item in paperNameOptions"
                 :key="item.id"
@@ -106,7 +107,8 @@
             <el-select
               filterable
               allow-create
-              v-model="form.pageCount">
+              v-model="form.pageCount"
+              @input.native="selectBlur2($event)">
               <el-option
                 v-for="item in pageCountOptions"
                 :key="item.id"
@@ -121,7 +123,8 @@
             <el-select
               filterable
               allow-create
-              v-model="form.printColor">
+              v-model="form.printColor"
+              @input.native="selectBlur3($event)">
               <el-option
                 v-for="item in printColorOptions"
                 :key="item.id"
@@ -145,14 +148,14 @@
       </el-row>
       <el-row :gutter="0">
         <el-col :span="24">
-          <div class="tip">报价信息</div>
+          <div class="tip2">报价信息</div>
         </el-col>
       </el-row>
       <el-row :gutter="24" type="flex" justify="left">
         <el-col :span="5">
           <el-form-item size="small" label="数量">
             <el-input type="number"  v-model="form.printQty" placeholder="数量" style="width: 53%"></el-input>
-            <el-input v-model="form.printQtyUnit" placeholder="单位" style="width: 30%"></el-input>
+            <el-input v-model="form.printQtyUnit" placeholder="单位" style="width: 20%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
@@ -166,7 +169,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item size="small" label="已收金额">
+          <el-form-item size="small" label="已收金额" class="item">
             <el-input type="number" v-model="form.payMoney"></el-input>
           </el-form-item>
         </el-col>
@@ -216,7 +219,7 @@
 <!--      </el-row>-->
       <el-row :gutter="0" type="flex" justify="left">
             <el-col :span="24">
-              <div class="tip">外发信息</div>
+              <div class="tip3">外发信息</div>
         </el-col>
       </el-row>
       <el-row :gutter="2" type="flex" justify="left">
@@ -293,7 +296,7 @@
       </el-row>
       <el-row :gutter="0" type="flex" justify="left">
           <el-col :span="24">
-            <div class="tip">成本信息</div>
+            <div class="tip4">成本信息</div>
           </el-col>
       </el-row>
       <el-row :gutter="2" type="flex" justify="left">
@@ -750,15 +753,22 @@ export default {
     },
 
     // 下拉框可输入
-    selectBlur(e, index1, index2) {
+    selectBlur1(e) {
       var _that = this
-      _that.partList[index1].paramValueList[index2].paramLabel = e.target.value
+      if (e.target != undefined) {
+        _that.form.paperName = e.target.value
+      }
+    },
+    selectBlur2(e) {
+      var _that = this
+      if (e.target != undefined) {
+        _that.form.pageCount = e.target.value
+      }
     },
-    selectBlur1(e, index1, index2) {
+    selectBlur3(e) {
       var _that = this
       if (e.target != undefined) {
-        _that.partListNew[index1].paramValueList[index2].paramDisplay = e.target.value
-        _that.partListNew[index1].paramValueList[index2].paramValue = e.target.value
+        _that.form.printColor = e.target.value
       }
     },
     // 保存
@@ -851,6 +861,10 @@ export default {
 .itemlabel .el-form-item__label {
   margin-top: 5px;
 }
+.item .el-form-item__label {
+  color: red;
+}
+
 </style>
 <style scoped>
 .filter-container {
@@ -900,6 +914,27 @@ export default {
   border-left: 5px solid #50bfff;
   margin: 8px 0;
 }
+.tip2 {
+  padding: 8px 16px;
+  background-color: #ffeeec;
+  border-radius: 4px;
+  border-left: 5px solid #ff5050;
+  margin: 8px 0;
+}
+.tip3 {
+  padding: 8px 16px;
+  background-color: #fffcec;
+  border-radius: 4px;
+  border-left: 5px solid #fff050;
+  margin: 8px 0;
+}
+.tip4 {
+  padding: 8px 16px;
+  background-color: #ecffee;
+  border-radius: 4px;
+  border-left: 5px solid #a5ff50;
+  margin: 8px 0;
+}
 
 .box-header-icon {
   float: right;

src/views/order/orderList/orderList.vue

@@ -20,26 +20,26 @@
               </el-form-item>
             </el-col>
             <el-col :span="2">
-            <el-input :size="sizeType" v-model.trim="search.keyWord" placeholder="关键字" ></el-input>
+            <el-input :size="sizeType" v-model.trim="search.keyWord" @change="combinedQueryBtn" clearable placeholder="关键字" ></el-input>
             </el-col>
             <el-col :span="2">
               <el-form-item prop="orderCode">
-                <el-input placeholder="订单编号" :size="sizeType" v-model.trim="searchForm.orderCode"></el-input>
+                <el-input placeholder="订单编号" :size="sizeType" @change="combinedQueryBtn" clearable v-model.trim="searchForm.orderCode"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="2">
               <el-form-item prop="clientName">
-                <el-input placeholder="客户名称" :size="sizeType" v-model.trim="searchForm.clientName"></el-input>
+                <el-input placeholder="客户名称" :size="sizeType" @change="combinedQueryBtn" clearable v-model.trim="searchForm.clientName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="2">
               <el-form-item prop="orderName">
-                <el-input placeholder="订单名称" :size="sizeType" v-model.trim="searchForm.orderName"></el-input>
+                <el-input placeholder="订单名称" :size="sizeType" @change="combinedQueryBtn" clearable v-model.trim="searchForm.orderName"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="订单状态" prop="orderState">
-                <el-select v-model="searchForm.orderState" :size="sizeType" filterable placeholder="订单状态" value-key="id">
+                <el-select v-model="searchForm.orderState" style="width: 50%" :size="sizeType" @change="combinedQueryBtn" filterable placeholder="订单状态" value-key="id">
                   <el-option
                     label="全部"
                     value="-1">
@@ -59,11 +59,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="2">
-              <el-form-item label="" prop="orderStateCharge">
-                <el-select v-model="searchForm.orderStateCharge" :size="sizeType" @change="combinedQueryBtn" filterable placeholder="收款状态" value-key="id">
+            <el-col :span="3">
+              <el-form-item label="收款状态" prop="orderStateCharge">
+                <el-select v-model="searchForm.orderStateCharge" style="width: 50%" :size="sizeType" @change="combinedQueryBtn" filterable placeholder="收款状态" value-key="id">
                   <el-option
-                    label="收款状态(全部)"
+                    label="全部"
                     value="-1">
                   </el-option>
                   <el-option
@@ -88,7 +88,6 @@
             :size="sizeType"
             @click="combinedQueryBtn">搜索
           </el-button>
-          <el-button style="margin-bottom: 10px" @click="resetForm('searchForm')" :size="sizeType">重置</el-button>
           <el-button
             class="filter-item"
             type="green"
@@ -97,6 +96,12 @@
             @click="createOrderFun">
             创建订单
           </el-button>
+          <el-button
+            style="margin-bottom: 10px;margin-right: 10px"
+            type="warning"
+            :size="sizeType"
+            @click="exportList">导出
+          </el-button>
         </el-form>
       <div class="top-right-btn">
         <el-tooltip class="item" effect="dark" content="刷新" placement="top">
@@ -410,7 +415,6 @@ import Kanban from '@/components/Kanban'
 import OrderMessage from '@/components/orderMessage/orderMessage'
 import plupload from '@/components/plupload/plupload.vue'
 import Addressdny from '@/components/Dialog/Addressdny'
-import {regionData} from 'element-china-area-data'
 import OrderDetail from '@/components/orderDetail/orderDetail'
 import {getConfigInfo} from '@/api/system/config'
 import OrderStep from '@/components/orderStep/orderStep'
@@ -421,18 +425,10 @@ const searchForm = {
   orderState: '-1',
   orderStateCharge: '-1',
   orderCode: '',
-  printBillCode: '',
-  clientCode: '',
   clientName: '',
   orderName: '',
   beginTime: '',
-  endTime: '',
-  createMan: '',
-  idProduct: '-1',
-  businessKind: '-1',
-  orderType: '-1',
-  platformOrderID: '',
-  logisticsCode: ''
+  endTime: ''
 }
 const lifeForm = {
   idOrder: '', // 操作的订单id，
@@ -492,9 +488,9 @@ const defaultItems = [
   {
     name: '印刷颜色', id: 11, field: 'printColor', width: '100'
   },
-  {
-    name: '生产工艺', id: 12, field: 'printAllCoverFlag', width: '100'
-  },
+  // {
+  //   name: '生产工艺', id: 12, field: 'printAllCoverFlag', width: '100'
+  // },
   {
     name: '送货地址', id: 13, field: 'sendAddress', width: '100'
   },
@@ -634,13 +630,7 @@ export default {
       addressOption: [],
       // 发货方式
       sendKinds: [],
-      // 发货区域
-      shipAreaList: [],
-      option: regionData,
-      addressDialogInfo: {
-        orderState: '',
-        boxCount: ''
-      },
+
       activeTabName: 'first',
       // deliveryColumns: Object.assign([], deliveryItems),