去掉开启预订

ghs/src/views/order/add.vue

@@ -53,16 +53,6 @@
 
 			<template #slot-top-element>
 				<el-input v-model="name" placeholder="搜索客户" size="big" style="width:400px;" ref="customSearchRef" @input="changeText()"></el-input>
-
-				<el-popover style="margin-left:40px;" placement="top" width="160" ref="openCloseBookRef">
-					<p>确认{{ shopInfo.bookSn==0?'开启':'结束' }}？</p>
-					<div style="text-align: right; margin: 0">
-					<el-button size="mini" type="text" @click.stop="cancelBook">取消</el-button>
-					<el-button type="primary" size="mini" @click.stop="changeBook(shopInfo.bookSn)">确定</el-button>
-					</div>
-					<el-button slot="reference" type="primary">{{ shopInfo.bookSn==0?'开启预订':'结束预订' }}</el-button>
-				</el-popover>
-
 			</template>
 
 		</x-crud>

ghs/src/views/order/book.vue

@@ -21,15 +21,6 @@
 			<template #slot-option-area-list>
         <el-input v-model="search" placeholder="搜索花材" size="big" style="width:200px;" :clearable="true" ref="itemSearchRef" @input="changeSearch()" @focus="search=''"></el-input>
 
-        <el-popover style="margin-left:40px;" placement="top" width="160" ref="openCloseBookRef">
-          <p>确认{{ shop.bookSn==0?'开启':'结束' }}？</p>
-          <div style="text-align: right; margin: 0">
-          <el-button size="mini" type="text" @click.stop="cancelBook">取消</el-button>
-          <el-button type="primary" size="mini" @click.stop="changeBook(shop.bookSn)">确定</el-button>
-          </div>
-          <el-button slot="reference" type="primary">{{ shop.bookSn==0?'开启预订':'结束预订' }}</el-button>
-        </el-popover>
-
         <el-button type="primary" size="mini" @click="myCgOrder()" style="margin-left:40px;">我的采购</el-button>
         <el-button type="primary" size="mini" @click="goCg" style="margin-left:40px;">去采购</el-button>
         <el-button type="primary" size="mini" @click="exportStockAssign()" style="margin-left:40px;">导出库存分配</el-button>

ghs/src/views/order/confirm.vue

@@ -151,7 +151,7 @@
         <div class="accounts-list">
           付款方式
           <div class="accounts-center">
-            <el-button :type="form.hasPay == 2?'primary':''" @keyup.enter.native="form.hasPay = 2" @click="form.hasPay = 2" size="small">赊账</el-button>
+            <el-button :type="form.hasPay == 2?'primary':''" @keyup.enter.native="form.hasPay = 2" @click="form.hasPay = 2" size="small">挂账</el-button>
             <el-button :type="form.hasPay == 1?'primary':''" @keyup.enter.native="form.hasPay = 1" @click="form.hasPay = 1" size="small">线下</el-button>
           </div>
         </div>
@@ -303,6 +303,7 @@ export default {
       TT:null,
       defaultGetStaffName:'',
       defaultGetStaffId:0,
+      cgUnitType:0
     };
   },
 	mixins: [productMins],
@@ -561,7 +562,7 @@ export default {
       if(this.form.hasPay == 1){
         name = '确认线下付款？'
       }else if(this.form.hasPay == 2){
-        name = '确认赊账？'
+        name = '确认挂账？'
       }else{
         name = '确认提交'
       }
@@ -687,7 +688,11 @@ export default {
     selectCurrentItem(currentItem){
         this.currentItem = currentItem
         this.customData.bigCount = currentItem.bigCount > 0 ? currentItem.bigCount : 1
-        this.customData.userPrice = parseFloat(this.currentItem.price)
+        if(this.changeType == 'add'){
+          this.customData.userPrice = parseFloat(this.currentItem.price)
+        }else{
+          this.customData.userPrice = parseFloat(this.currentItem.userPrice)
+        }
         this.customData.remark = this.currentItem.remark||''
         this.desk = 'confirmPriceNum';
         this.showGetItemList = false