shish 2 лет назад
Родитель
Сommit
9892265bd8

+ 2 - 2
ghs/src/views/home.vue

@@ -83,7 +83,7 @@ export default {
 					url: '/order/list?status=4'
 				},
 				{
-					name: '待配送订单',
+					name: '待发货订单',
 					val: '',
 					url: '/order/list?status=2'
 				},
@@ -110,7 +110,7 @@ export default {
 					url: '/member/list'
 				},
 				{
-					name: '供货',
+					name: '供货',
 					icon: 'iconkehuguanli',
 					url: '/in/ghs'
 				},

+ 1 - 1
ghs/src/views/in/confirm.vue

@@ -105,7 +105,7 @@
     </div>
     <div class="bottom_input">
         <span style="margin-right:10px;font-weight: 700;">花材</span>
-        <el-input style="width: 280px;font-size:13px" @input="beginSearchItem" @keyup.enter.native="pickAddCurrentItem" @focus="clearSeachVal" placeholder="这里搜索,光标插入 Ctrl + Q" type="text" ref="itemSearchRef" v-model="searchVal"></el-input>
+        <el-input style="width: 280px;font-size:13px" @input="beginSearchItem" @keyup.enter.native="pickAddCurrentItem" @focus="clearSeachVal" placeholder="这里搜索,支持字母搜索 Ctrl + Q" type="text" ref="itemSearchRef" v-model="searchVal"></el-input>
         <div style="display: inline-block;" class="allPrice">{{allCount.kind}}种</div>
         <div style="display: inline-block;" class="allPrice">{{ allCount.bigLength }}扎</div>
         <div style="display: inline-block;" class="allPrice">¥{{ allPrice }}</div>

+ 2 - 2
ghs/src/views/order/confirm.vue

@@ -190,7 +190,7 @@
 
         <div class="accounts-list">
           送货日期
-          <el-date-picker v-model="form.sendTimeWant" style="width: 80%" type="date" placeholder="请选择,默认当天或隔天"> </el-date-picker>
+          <el-date-picker v-model="form.sendTimeWant" style="width: 80%" type="date" value-format="yyyy-MM-dd" placeholder="请选择,默认当天或隔天"> </el-date-picker>
         </div>
         <div class="accounts-list">
           开单人员
@@ -200,7 +200,7 @@
         </div>
         <div class="accounts-list">
           账单日期
-          <el-date-picker v-model="form.historyDate" style="width: 80%" type="date" placeholder="请选择,默认当天"> </el-date-picker>
+          <el-date-picker v-model="form.historyDate" style="width: 80%" type="date" value-format="yyyy-MM-dd" placeholder="请选择,默认当天"> </el-date-picker>
         </div>
         <div class="accounts-list">
           备注信息

+ 3 - 3
ghs/src/views/order/list.vue

@@ -118,19 +118,19 @@
       </template>
 
       <template #slot-search-option="{scope}">
-        <el-radio-group v-model="book" @change="changeBook" style="margin-right:20px;padding-top:6px;margin-left:20px;">
+        <el-radio-group v-model="book" @change="changeBook" style="margin-right:20px;padding-top:6px;margin-left:5px;">
           <el-radio label="-1">全部</el-radio>
           <el-radio label="0">常规订单</el-radio>
           <el-radio label="1">预订单</el-radio>
         </el-radio-group>
-        <el-radio-group v-model="clearSign" @change="changeClearSign" style="margin-right:20px;padding-top:6px;margin-left:25px;">
+        <el-radio-group v-model="clearSign" @change="changeClearSign" style="margin-right:15px;padding-top:6px;margin-left:5px;">
         <el-radio label="-1">全部</el-radio>
           <el-radio label="0">待结款</el-radio>
           <el-radio label="1">已结款</el-radio>
         </el-radio-group>
         付款时间:
         <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
-                end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:20px;">
+                end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:10px;">
         </el-date-picker>
 
       </template>