pc-供货商订单发货

ghs/src/views/order/add.vue

@@ -143,25 +143,29 @@
       </el-table>
     </div>
     <div class="bottom_input">
-      <el-form ref="form" label-width="80px" style="display: inline-block">
-        <el-form-item label="花材" style="font-weight: 700;">
-          <el-input style="width: 280px;font-size:13px" @keyup.enter.native="enterSeekFun()" placeholder="请输入名称，支持拼音首字母，按Esc取消" type="text" ref="commodityInput" v-model="seekVal"></el-input></el-form-item>
-      </el-form>
+<!--      <el-form ref="form" label-width="80px" style="display: inline-block">-->
+<!--        <el-form-item label="花材" style="font-weight: 700;">-->
+<!--          <el-input style="width: 280px;font-size:13px" @keyup.enter.native="enterSeekFun()" placeholder="请输入名称，支持拼音首字母，按Esc取消" type="text" ref="commodityInput" v-model="seekVal"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+      <span style="margin-right:10px;font-weight: 700;">花材</span>
+      <el-input style="width: 280px;font-size:13px" @keyup.enter.native="enterSeekFun()" placeholder="请输入名称，支持拼音首字母，按Esc取消" type="text" ref="commodityInput" v-model="seekVal"></el-input>
+
       <div style="display: inline-block;" class="allPrice">总金额: {{ totalMoney.toFixed(2) }}</div>
       <div style="display: inline-block;" class="allPrice">总数量: {{tableData.length}}</div>
       <div style="display: inline-block;" class="allPrice active">
         <el-checkbox v-model="checked"></el-checkbox>
         结账后自动打印
-        <el-input style="width: 50px;" type="text" v-model="printAmount"></el-input></el-form-item>
+        <el-input style="width: 50px;" type="text" v-model="printAmount"></el-input>
         份
       </div>
     </div>
     <el-dialog title="选择花材" v-if="isSelectNumber" :visible.sync="isSelectNumber" width="30%" center>
       <div class="el-dialog-center">
         <span>{{ seekList[seekListIndex].itemName }}</span>
-        <el-input ref="bigInput" style="width: 130px;margin-left: 15px" placeholder="0" @keyup.key-backspace.native="backspaceFun('big')" @keyup.enter.native="enterFun()" type="number" v-model="big"></el-input></el-form-item>
+        <el-input ref="bigInput" style="width: 130px;margin-left: 15px" placeholder="0" @keyup.key-backspace.native="backspaceFun('big')" @keyup.enter.native="enterFun()" type="number" v-model="big"></el-input>
         <span>{{seekList[seekListIndex].bigUnit}}</span>
-        <el-input style="width: 130px;margin-left: 15px" placeholder="0" @keyup.key-backspace.native="backspaceFun('small')" @keyup.enter.native="enterFun()" type="number" v-model="small"></el-input></el-form-item>
+        <el-input style="width: 130px;margin-left: 15px" placeholder="0" @keyup.key-backspace.native="backspaceFun('small')" @keyup.enter.native="enterFun()" type="number" v-model="small"></el-input>
         <span>{{ seekList[seekListIndex].smallUnit }}</span>
       </div>
       <div class="remark">Enter 确定，数字键 改数量，Backspace 清0，Enter 确定，Esc 取消</div>
@@ -169,7 +173,7 @@
 
     <el-dialog title="改价" v-if="isAmendPrice" :visible.sync="isAmendPrice" width="30%" center>
       <div class="el-dialog-center">
-        <el-input ref="priceInput" style="width: 130px;margin-left: 15px" type="number" placeholder="0" @keyup.enter.native="amendPrice" @keyup.key-backspace.native="priceAmend = ''" v-model="priceAmend"></el-input></el-form-item>
+        <el-input ref="priceInput" style="width: 130px;margin-left: 15px" type="number" placeholder="0" @keyup.enter.native="amendPrice" @keyup.key-backspace.native="priceAmend = ''" v-model="priceAmend"></el-input>
       </div>
     </el-dialog>
 

ghs/src/views/order/components/sel-order.vue

@@ -60,7 +60,7 @@
 										<div class="label-list">运费：¥{{ item.sendInfo.cost }}</div>
 										<div class="label-list">小费：¥{{ item.sendInfo.tip }}</div>
                     <el-popover placement="top" width="160" v-model="sendMySelfConfirm" v-if="orderData.status==3">
-                      <p>确认送到了？</p>
+                      <p>快递送到后会自动确定，需要自己确认？</p>
                       <div style="text-align: right; margin: 0">
                         <el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
                         <el-button type="primary" size="mini" @click="affirmDeliver">确定</el-button>
@@ -143,13 +143,7 @@
 		<!-- 填单 -->
 		<el-dialog title="确认客户地址" :visible.sync="orderDialog" :close-on-click-modal="false" width="30%">
 			<div class="order-modal-content">
-				<el-form
-					:model="orderForm"
-					:rules="ruleForm"
-					ref="orderForm"
-					label-width="100px"
-					class="demo-form"
-				>
+				<el-form :model="orderForm" :rules="ruleForm" ref="orderForm" label-width="100px" class="demo-form">
 					<div class="form-wrap">
 						<!-- 左侧 -->
 						<div class="form-left-wrap">
@@ -168,10 +162,10 @@
 							</el-form-item>
 
 							<el-form-item label="客户名称" prop="customName" style="margin-bottom: 8px;">
-								<el-input v-model="orderForm.customName" placeholder="请填写" size="mini"></el-input>
+								<el-input v-model="freightInfo.customName" placeholder="请填写" size="mini"></el-input>
 							</el-form-item>
 							<el-form-item label="客户手机" prop="customMobile" style="margin-bottom: 8px;">
-								<el-input v-model="orderForm.customMobile" placeholder="请填写" size="mini"></el-input>
+								<el-input v-model="freightInfo.customMobile" placeholder="请填写" size="mini"></el-input>
 							</el-form-item>
 
 							<el-form-item label="详细地址" prop="receiveAddress" style="margin-bottom: 8px;">
@@ -381,6 +375,8 @@ export default {
 				customName:'',
 				customMobile:'',
 				sendTime: '',
+        receiveUserName: '', // 收花人姓名；到店自提的姓名
+        receiveMobile: '', // 收花人手机；到店自提的电话；
 			},
 			orderForm: {
 				sendSide:'',//配送方
@@ -442,7 +438,11 @@ export default {
 		...mapGetters({ categoryData: 'category' }),
 		...mapGetters({ usageData: 'usage', shopInfo: 'shopInfo' })
 	},
-	methods: {
+  mounted() {
+    this.freightInfo.expressId = this.sendSideOpt[0].value;
+    this.orderForm.sendSide = this.sendSideOpt[0].label;
+  },
+  methods: {
     selectSendSide(e){
       this.freightInfo.expressId = e;
       this.freight()

ghs/src/views/order/list.vue

@@ -107,6 +107,54 @@
 		<order-detail ref="orderDetail" :orderOperate="optionData" />
 		<!-- 发货状态 -->
 		<sel-order ref="selOrder" :id="optionData.id" @song-success="onSongSuccess" />
+    <!-- 配送单 -->
+    <div class="print-html">
+
+      <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
+        <tr>
+          <td style="padding: 10px;width: 260px;">客户：{{orderMsg.customName}}</td>
+          <td style="padding: 10px;width: 260px;">单号：{{orderMsg.orderSn}}</td>
+          <td style="padding: 10px;width: 260px;">日期：{{orderMsg.deadline}}</td>
+        </tr>
+      </table>
+      <table border="1" width="780" style="border:solid 1px black;border-collapse:collapse">
+        <tr>
+          <td style="padding: 10px;width: 100px;text-align: center;">序号</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">名称</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">单位</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">数量</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">单价</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">金额</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">备注</td>
+        </tr>
+        <tr v-for="(res,i) in printSelectList">
+          <td style="padding: 10px;width: 100px;text-align: center;">{{ i+1 }}</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">{{ res.name }}</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">{{ res.unit }}</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">{{ res.count }}</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">{{ res.price }}</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">{{ res.money }}</td>
+          <td style="padding: 10px;width: 100px;text-align: center;"></td>
+        </tr>
+        <tr>
+          <td style="padding: 10px;width: 100px;" colspan="2">合计：{{totalMoney.toFixed(2)}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">实收：{{payType=='已收款'?totalMoney.toFixed(2):'0.00'}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">欠款：{{payType=='欠款'?totalMoney.toFixed(2):'0.00'}}</td>
+          <td style="padding: 10px;width: 100px;"></td>
+        </tr>
+        <tr>
+          <td style="padding: 10px;width: 100px;">其他说明：</td>
+          <td style="padding: 10px;width: 100px;" colspan="6">{{remark}}</td>
+        </tr>
+      </table>
+      <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
+        <tr >
+          <td style="padding: 10px;width: 260px;">开单：{{orderMsg.shopAdminName}}</td>
+          <td style="padding: 10px;width: 260px;">配送：</td>
+          <td style="padding: 10px;width: 260px;">打印时间：{{todays(1)}}</td>
+        </tr>
+      </table>
+    </div>
 	</div>
 </template>
 
@@ -164,6 +212,9 @@ export default {
 			this.$store.dispatch('getCategory');
 			this.$store.dispatch('getUsage');
 		},
+    printOrder(e){
+		  console.log(e)
+    },
 		//取消自取
 		selfGetCancel(id) {
 			this.$refs[`popover-` + id].doClose();