订单搜索优化

ghs/src/views/book/custom.vue

@@ -19,7 +19,37 @@
 			</template>
 
 			<template #table-column-name="{scope}">
-				{{ scope.row.name }}<span v-if="scope.row.seatSn!=0">（{{ scope.row.seatSn }}）</span>
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">
+					{{ scope.row.name }}<span v-if="scope.row.seatSn!=0">（{{ scope.row.seatSn }}）</span>
+				</span>
+				<span v-else>
+					{{ scope.row.name }}<span v-if="scope.row.seatSn!=0">（{{ scope.row.seatSn }}）</span>
+				</span>
+			</template>
+
+			<template #table-column-roadNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.roadNum }}</span>
+				<span v-else>{{ scope.row.roadNum }}</span>
+			</template>
+
+			<template #table-column-hasRemark="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.hasRemark==1?'有':'' }}</span>
+				<span v-else>{{ scope.row.hasRemark==1?'有':'' }}</span>
+			</template>
+
+			<template #table-column-bookNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.bookNum }}</span>
+				<span v-else>{{ scope.row.bookNum }}</span>
+			</template>
+
+			<template #table-column-onNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.onNum }}</span>
+				<span v-else>{{ scope.row.onNum }}</span>
+			</template>
+
+			<template #table-column-needCgNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.needCgNum }}</span>
+				<span v-else>{{ scope.row.needCgNum }}</span>
 			</template>
 
 			<template #slot-option-area-list>
@@ -146,12 +176,7 @@ export default {
 						},
 						{
 							prop: 'hasRemark',
-							label: '是否备注',
-							align: 'center',
-						},
-						{
-							prop: 'box',
-							label: '是否装箱',
+							label: '备注',
 							align: 'center',
 						}
 					],

ghs/src/views/book/itemCustom.vue

@@ -23,16 +23,45 @@
 			</template>
 
 			<template #slot-search-option="{scope}">
-                <span style="font-size:32upx;color:blue;font-weight:bold;margin-left:30upx;padding:10upx 0 10upx 0;" v-if="Number(itemId)>0">
-					【{{ remainName }}】<span v-if="remainNum && Number(remainNum)>0">剩 {{ remainNum }}份</span>
+			</template>
+
+			<template #table-column-customName="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">
+					{{ scope.row.customName }}<span v-if="scope.row.seatSn!=0">（{{ scope.row.seatSn }}）</span>
 				</span>
-				<span v-if="Number(customId)>0" style="font-size:32upx;color:black;font-weight:bold;margin-left:30upx;padding:10upx 0 10upx 0;">
-					【{{ customName }}】预订的花材
+				<span v-else>
+					{{ scope.row.customName }}<span v-if="scope.row.seatSn!=0">（{{ scope.row.seatSn }}）</span>
 				</span>
 			</template>
 
-			<template #table-column-customName="{scope}">
-				{{ scope.row.customName }}<span v-if="scope.row.seatSn!=0">（{{ scope.row.seatSn }}）</span>
+			<template #table-column-roadNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.roadNum }}</span>
+				<span v-else>{{ scope.row.roadNum }}</span>
+			</template>
+
+			<template #table-column-needCgNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.needCgNum }}</span>
+				<span v-else>{{ scope.row.needCgNum }}</span>
+			</template>
+
+			<template #table-column-name="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.name }}</span>
+				<span v-else>{{ scope.row.name }}</span>
+			</template>
+
+			<template #table-column-bookNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.bookNum }}</span>
+				<span v-else>{{ scope.row.bookNum }}</span>
+			</template>
+
+			<template #table-column-remark="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.remark }}</span>
+				<span v-else>{{ scope.row.remark }}</span>
+			</template>
+
+			<template #table-column-onNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.onNum }}</span>
+				<span v-else>{{ scope.row.onNum }}</span>
 			</template>
 
 			<template #slot-more-do-btn>
@@ -264,7 +293,7 @@ export default {
 						width: 80
 					},
 					{
-						prop: 'hasRemark',
+						prop: 'remark',
 						label: '备注',
 						align: 'center',
 						width: 100

ghs/src/views/order/book.vue

@@ -35,10 +35,18 @@
 			</template>
 
       <template #table-column-remainStockNum="{scope}">
-          <span v-if="Number(scope.row.remainStockNum)>0 && (Number(scope.row.bookNum)-Number(scope.row.onNum))>0" style="color:blue;font-weight:bold;">
-            {{scope.row.remainStockNum?parseFloat(scope.row.remainStockNum):0}}
+          <span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">
+            <span v-if="Number(scope.row.remainStockNum)>0 && (Number(scope.row.bookNum)-Number(scope.row.onNum))>0" style="color:blue;font-weight:bold;">
+              {{scope.row.remainStockNum?parseFloat(scope.row.remainStockNum):0}}
+            </span>
+            <span v-else>{{scope.row.remainStockNum?parseFloat(scope.row.remainStockNum):0}}</span>
+          </span>
+          <span v-else>
+            <span v-if="Number(scope.row.remainStockNum)>0 && (Number(scope.row.bookNum)-Number(scope.row.onNum))>0" style="color:blue;font-weight:bold;">
+              {{scope.row.remainStockNum?parseFloat(scope.row.remainStockNum):0}}
+            </span>
+            <span v-else>{{scope.row.remainStockNum?parseFloat(scope.row.remainStockNum):0}}</span>
           </span>
-          <span v-else>{{scope.row.remainStockNum?parseFloat(scope.row.remainStockNum):0}}</span>
       </template>
 
 			<template #slot-column-option="{scope}">
@@ -50,6 +58,39 @@
         <el-button @click.stop="getStock(scope.row)" size="medium" type="primary">库存明细</el-button>
       </template>
 
+
+			<template #table-column-roadNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.roadNum }}</span>
+				<span v-else>{{ scope.row.roadNum }}</span>
+			</template>
+
+			<template #table-column-needCgNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.needCgNum }}</span>
+				<span v-else>{{ scope.row.needCgNum }}</span>
+			</template>
+
+			<template #table-column-name="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.name }}</span>
+				<span v-else>{{ scope.row.name }}</span>
+			</template>
+
+			<template #table-column-bookNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.bookNum }}</span>
+				<span v-else>{{ scope.row.bookNum }}</span>
+			</template>
+
+			<template #table-column-hasRemark="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.hasRemark==1?'有':'' }}</span>
+				<span v-else>{{ scope.row.hasRemark==1?'有':'' }}</span>
+			</template>
+
+			<template #table-column-onNum="{scope}">
+				<span v-if="scope.row.bookNum == scope.row.onNum" style="color:green;font-weight:bold;">{{ scope.row.onNum }}</span>
+				<span v-else>{{ scope.row.onNum }}</span>
+			</template>
+
+
+
     </x-crud>
 
     <stock-detail ref="stockDetail" :itemData="itemData" />
@@ -284,6 +325,11 @@ export default {
                 label: '待采',
                 align: 'center'
               },
+              {
+                prop: 'hasRemark',
+                label: '备注',
+                align: 'center',
+						  }
             ],
             op: {
               visible: true,

ghs/src/views/order/list.vue

@@ -59,7 +59,7 @@
         <span v-if="scope.row.printNum>0">
           {{ scope.row.printNum }}
         </span>
-        <span v-else style="color:blue;font-weight:bold;font-size:16px;">
+        <span v-else style="font-size:14px;">
         {{ scope.row.printNum }}
         </span>
       </template>
@@ -70,7 +70,7 @@
       </template>
 
       <template #table-column-sameTimeIdsNum="{scope}">
-        <div v-if="scope.row.sameTimeIdsNum>1" style="color:blue;font-weight:bold;font-size:16px;">{{ scope.row.sameTimeIdsNum }}</div>
+        <div v-if="scope.row.sameTimeIdsNum>1" style="font-weight:bold;font-size:14px;">{{ scope.row.sameTimeIdsNum }}</div>
         <div v-else>-</div>
       </template>
 
@@ -108,16 +108,21 @@
         <el-button @click.stop="allDown(scope.row)" size="small" type="primary" v-if="scope.row.status!=5 && scope.row.status!=1 && scope.row.sameTimeIdsNum>1">全下载</el-button>
         <el-button size="small" v-else>全下载</el-button>
 
-<template v-if="scope.row.status!=5 && scope.row.status==2">
-        <el-popconfirm title="确认已发货？" @confirm="confirmSend(scope.row)" @onConfirm="confirmSend(scope.row)" style="margin-left:10px;">
-          <el-button size="small" type="primary" slot="reference">发货</el-button>
-        </el-popconfirm>
-</template>
+        <template v-if="scope.row.status!=5 && scope.row.status==2">
+          <el-popconfirm title="确认已发货？" @confirm="confirmSend(scope.row)" @onConfirm="confirmSend(scope.row)" style="margin-left:10px;">
+            <el-button size="small" type="primary" slot="reference">发货</el-button>
+          </el-popconfirm>
+        </template>
+
         <el-button size="small" v-else>发货</el-button>
 
       </template>
 
       <template #slot-search-option="{scope}">
+        <span style="margin-left:6px;font-size:19px;">付款时间：</span>
+        <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:10px;">
+        </el-date-picker>
         <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>
@@ -128,11 +133,6 @@
           <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:10px;">
-        </el-date-picker>
-
       </template>
 
 			<template #slot-export-order>
@@ -594,11 +594,11 @@ export default {
             }
           })
           .set('search', {
-            key: { placeholder: '订单号 | 客户名称'}
+            key: { placeholder: '订单号 / 客户名称'}
           })
           .set('layout', [
             ['slot-tabs'],
-            ['slot-search-option','search-key','slot-billing','slot-export-order'],
+            ['search-key','slot-search-option','slot-export-order'],
             ['data-table'],
             ['flex1', 'pagination']
           ])

ghsApp/src/admin/book/custom.vue

@@ -20,7 +20,6 @@
 							<t-th><view style="color:black;">路上</view></t-th>
 							<t-th><view style="color:black;">待采</view></t-th>
 							<t-th><view style="color:black;">备注</view></t-th>
-							<t-th><view style="color:black;">装箱</view></t-th>
 						</t-tr>
 						<template v-if="!$util.isEmpty(bookCustomData)">
 							<view v-for="(item, index) in bookCustomData" :key="index" @click="goAction(item)">
@@ -42,11 +41,6 @@
 										<image :src="`${constant.imgUrl}/ghs/book/remark2.png`" style="width:38upx;height:38upx;display:inline-block;" mode="widthFix" v-if="item.hasRemark == 1"></image>
 										</view>
 									</t-td>
-									<t-td>
-										<view>
-										<image :src="`${constant.imgUrl}/ghs/book/box1.png`" style="width:38upx;height:38upx;display:inline-block;" mode="widthFix" v-if="item.box == 1"></image>
-										</view>
-									</t-td>
 								</t-tr>
 							</view>
 						</template>