Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/src/views/order/list.vue

@@ -108,7 +108,7 @@
 		<!-- 发货状态 -->
 		<sel-order ref="selOrder" :id="optionData.id" @song-success="onSongSuccess" />
     <!-- 配送单 -->
-    <div class="print-html">
+    <div class="print-html-box" >
 
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
         <tr>
@@ -127,24 +127,25 @@
           <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">
+        <tr v-for="(res,i) in orderMsg.product">
           <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;">扎/支</td>
+          <td style="padding: 10px;width: 100px;text-align: center;">{{ `${res.bigNum}/${res.smallNum}` }}</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;" v-if="res.ratio==0">{{  Number(res.price) * (Number(res.bigNum) + 0) }}</td>
+          <td style="padding: 10px;width: 100px;text-align: center;" v-else>{{  Number(res.price) * (Number(res.bigNum) + Number(res.smallNum) / Number(res.ratio)) }}</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;" colspan="2">合计：{{orderMsg.actPrice}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">实收：{{orderMsg.debt==0?orderMsg.actPrice:'0.00'}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">欠款：{{orderMsg.debt==1?orderMsg.actPrice:'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>
+          <td style="padding: 10px;width: 100px;" colspan="6">{{orderMsg.remark}}</td>
         </tr>
       </table>
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
@@ -161,6 +162,7 @@
 <script>
 import SelOrder from './components/sel-order';
 import OrderDetail from './components/order-detail';
+import { getLodop } from '@/utils/lodop';
 export default {
 	components: {
 		SelOrder,
@@ -198,13 +200,28 @@ export default {
 					val: 0
 				}
 			],
-			optionData: {}
+			optionData: {},
+      orderMsg:'',
 		};
 	},
 	created() {
 		this.init();
 	},
 	methods: {
+    todays(type) {
+      var myDate = new Date();
+      let todaty = '';
+      if(type==1){
+        todaty = myDate.getFullYear()+'-'+parseInt(myDate.getMonth()+1)+'-'+myDate.getDate()+' '+myDate.getHours()+':'+myDate.getMinutes()+':'+myDate.getSeconds()
+      }else if(type=='time'){
+        todaty = myDate.getHours()+':'+myDate.getMinutes();
+      }else{
+        let getDate = myDate.getDate()>9?myDate.getDate():'0'+myDate.getDate()
+        let getDateMonth = parseInt(myDate.getMonth()+1)>9?parseInt(myDate.getMonth()+1):'0'+parseInt(myDate.getMonth()+1)
+        todaty = myDate.getFullYear()+'-'+getDateMonth+'-'+getDate
+      }
+      return todaty
+    },
 		formatProgress(){
 			return ''
 		},
@@ -213,7 +230,28 @@ export default {
 			this.$store.dispatch('getUsage');
 		},
     printOrder(e){
-		  console.log(e)
+      this.$service.order.info({ id: e.id }).then(res => {
+        this.orderMsg = res;
+        this.$nextTick(() => {
+          let LODOP = getLodop();
+
+          LODOP.SET_PRINT_STYLE('FontSize', 20);
+          LODOP.SET_PRINT_STYLE('Bold', 1);
+          LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `纯彩花艺销售单`);
+          LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
+          LODOP.SET_PRINT_STYLE('FontSize', 12);
+
+          LODOP.ADD_PRINT_HTM(
+              200,
+              10,
+              790,
+              600,
+              document.querySelector('.print-html-box').innerHTML
+          );
+          LODOP.PREVIEW();
+          // LODOP.PRINT();
+        });
+      });
     },
 		//取消自取
 		selfGetCancel(id) {
@@ -381,6 +419,11 @@ export default {
 		}
 	}
 }
+.print-html-box {
+  position: fixed;
+  left: 0;
+  top: 9990px;
+}
 .steps-wrap {
 	width: 150px;
 	//height: 26px;

hdApp/src/admin/billing/affirmGhs.vue

@@ -417,7 +417,7 @@ export default {
 		affirmFormSubmit(){
 			// if(this.sendTime==''){uni.showToast({title:'请先选择时间',icon:'none'});return}
 			const product = this.selectList.map(ele => {
-				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId };
+				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
 			});
 			let parameter = {
 				getType:this.form.sendType,