去掉改价

ghs/src/views/in/add.vue

@@ -102,70 +102,28 @@
       <div class="remark">Enter 确定，Esc 取消</div>
     </el-dialog>
 
-    <el-dialog title="改价" v-if="clearPop" :visible.sync="clearPop" 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>
-      </div>
-    </el-dialog>
-
     <el-dialog title="确认提交" v-if="showCommitPop" :visible.sync="showCommitPop" width="655px" center :close-on-click-modal="false">
       <div>
         <div class="accounts-list">
           供货商
           <div class="accounts-center">{{form.ghsName}}</div>
         </div>
-
-        <div class="accounts-list" v-if="currentShop.pfLevel && currentShop.pfLevel == 1">
-          配送方式
-          <div class="accounts-center">
-            <el-button :type="form.transType == 4?'primary':''" @keyup.enter.native="setTransType(4)" @click="setTransType(4)" size="small">同城</el-button>
-            <el-button :type="form.transType == 0?'primary':''" @keyup.enter.native="setTransType(0)" @click="setTransType(0)" size="small">德邦</el-button>
-            <el-button :type="form.transType == 1?'primary':''" @keyup.enter.native="setTransType(1)" @click="setTransType(1)" size="small">顺丰</el-button>
-            <el-button :type="form.transType == 2?'primary':''" @keyup.enter.native="setTransType(2)" @click="setTransType(2)" size="small">冷链</el-button>
-            <el-button :type="form.transType == 3?'primary':''" @keyup.enter.native="setTransType(3)" @click="setTransType(3)" size="small">航空</el-button>
-            <el-button :type="form.transType == 5?'primary':''" @keyup.enter.native="setTransType(5)" @click="setTransType(5)" size="small">自取</el-button>
-          </div>
+        <div class="accounts-list">
+          采购人
+          <el-select ref="kdStaffRef" style="width:80%" v-model="form.getStaffName" placeholder="请选择，Ctrl + /" @change="changeKdStaff">
+            <el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item"> </el-option>
+          </el-select>
         </div>
-
-        <div class="accounts-list" v-else>
-          配送方式
-          <div class="accounts-center">
-            <el-button :type="form.sendType == 0?'primary':''" @keyup.enter.native="setSendType(0)" @click="setSendType(0)" size="small">送货</el-button>
-            <el-button :type="form.sendType == 1?'primary':''" @keyup.enter.native="setSendType(1)" @click="setSendType(1)" size="small">自取</el-button>
-            <el-button :type="form.sendType == 2?'primary':''" @keyup.enter.native="setSendType(2)" @click="setSendType(2)" size="small">跑腿</el-button>
-            <el-button :type="form.sendType == 3?'primary':''" @keyup.enter.native="setSendType(3)" @click="setSendType(3)" size="small">物流</el-button>
-          </div>
+        <div class="accounts-list">
+          入库日期
+          <el-date-picker v-model="form.sendTimeWant" style="width: 80%" type="date" placeholder="请选择"> </el-date-picker>
         </div>
-
         <div class="accounts-list" v-if="type=='配送'">
           运费
           <div class="accounts-center">
             <el-input @input="freightInput" placeholder="请填写运费，留空免运费" v-model="freight"></el-input>
           </div>    
         </div>
-        <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">赊账（ Ctrl + [ ）</el-button>
-            <el-button :type="form.hasPay == 1?'primary':''" @keyup.enter.native="form.hasPay = 1" @click="form.hasPay = 1" size="small">线下（ Ctrl + ] ）</el-button>
-          </div>
-        </div>
-        <div class="accounts-list" v-if="form.hasPay == 1">
-          线下方式
-          <div class="accounts-center">
-            <el-button :type="form.payWay == 0?'primary':''" @keyup.enter.native="form.payWay = 0" @click="form.payWay = 0" size="small">线下微信</el-button>
-            <el-button :type="form.payWay == 1?'primary':''" @keyup.enter.native="form.payWay = 1" @click="form.payWay = 1" size="small">线下支付宝</el-button>
-            <el-button :type="form.payWay == 4?'primary':''" @keyup.enter.native="form.payWay = 4" @click="form.payWay = 4" size="small">现金</el-button>
-            <el-button :type="form.payWay == 5?'primary':''" @keyup.enter.native="form.payWay = 5" @click="form.payWay = 5" size="small">银行卡</el-button>
-          </div>
-        </div>
-        <div class="accounts-list">
-          打印小票
-          <div class="accounts-center">
-          <el-button :type="form.needPrint == 1?'primary':''" @keyup.enter.native="form.needPrint = 1" @click="form.needPrint = 1" size="small">需要（ Ctrl + , ）</el-button>
-            <el-button :type="form.needPrint == 2?'primary':''" @keyup.enter.native="form.needPrint = 2" @click="form.needPrint = 2" size="small">不要（ Ctrl + . ）</el-button>
-          </div>
-        </div>
         <div class="accounts-list">
           合计金额
           <div class="accounts-center" style="color:black;">¥{{parseFloat(finalPrice)}}</div>
@@ -174,26 +132,6 @@
           {{ form.hasPay == 2 ? '应收金额' : '实收金额' }}
           <el-input style="width: 80%" v-model="modifyPrice" clearable></el-input>
         </div>
-
-        <div class="accounts-list" v-if="modifyPrice > 0 && modifyPrice > finalPrice" style="font-size:25upx;margin-left:20upx;color:red;font-weight:bold;">
-          人工资材
-          <div class="accounts-center">¥{{parseFloat((modifyPrice-finalPrice).toFixed(2))}}</div>
-        </div>
-        <div class="accounts-list" v-if="modifyPrice > 0 && modifyPrice < finalPrice" style="font-size:25upx;margin-left:20upx;color:green;font-weight:bold;">
-          优惠金额
-          <div class="accounts-center">¥{{parseFloat((finalPrice-modifyPrice).toFixed(2))}}</div>
-        </div>
-
-        <div class="accounts-list">
-          送货日期
-          <el-date-picker v-model="form.sendTimeWant" style="width: 80%" type="date" placeholder="请选择，默认当天或隔天"> </el-date-picker>
-        </div>
-        <div class="accounts-list">
-          开单 Ctrl + /
-          <el-select ref="kdStaffRef" style="width:80%" v-model="form.getStaffName" placeholder="请选择" @change="changeKdStaff">
-            <el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item"> </el-option>
-          </el-select>
-        </div>
         <div class="accounts-list">
           备注
           <div class="accounts-center">
@@ -204,21 +142,9 @@
           <span></span>
           <div class="accounts-center">
             <el-button @click="showCommitPop = false">取消（Esc）</el-button>
-            <el-button type="primary" @click="createOrder">确认（Ctrl+Enter）</el-button>
+            <el-button type="primary" @click="createOrder">下一步（Ctrl+Enter）</el-button>
           </div>
         </div>
-        <p style="text-align: center;color: #999999;">按Tab切到下一个，按空格选中</p>
-      </div>
-      <div style="text-align:center;margin-top:10px;font-size:16px;" v-if="!$util.isEmpty(diffList)">
-        <div style="font-size:16px;margin-bottom:10px;color:red;font-weight:bold;">
-          <div>以下花材，开单价和系统售价不一样，确认要提交吗？</div>
-          <el-button type="primary" @click="diffConfirm" size="mini">确认（Ctrl+Alt+Enter）</el-button>
-        </div>
-        <div v-for="(item, index) in diffList" :key="index" style="color:blue;margin-bottom:4px;">
-            {{ item.name }} 
-            系统售价<span style="color:green;font-weight:bold;margin-left:3px;">¥{{ item.price?parseFloat(item.price):0 }}</span> 
-            你开价<span style="color:red;font-weight:bold;margin-left:3px;">¥{{ item.kdPrice?parseFloat(item.kdPrice):0 }}</span>
-        </div>
       </div>
     </el-dialog>
   </div>
@@ -264,7 +190,6 @@ export default {
       type:'自提',//取货方式
       payType:'欠款',//结算方式
       showConfirmNum:false,//选择扎和支的弹窗
-      clearPop:false,//修改单价弹窗
       showCommitPop:false,//结账弹窗
       priceAmend:0,//修改单价弹窗
       desk:'',//操作桌面
@@ -435,14 +360,6 @@ export default {
         //获取开单人
         that.$service.shopAdmin.getAllStaff().then(res => {
           that.staffList = res.list
-          if(!that.$util.isEmpty(that.staffList)){
-            for(const ele of that.staffList){
-              if(currentStaff.id == ele.id){
-                that.form.getStaffId = ele.id
-                that.form.getStaffName = ele.name
-              }
-            }
-          }
         })
 		})
 
@@ -726,7 +643,6 @@ export default {
         this.selectIndex = 0
         this.$refs.singleTable.setCurrentRow(this.selectList[0])
       }
-      this.clearPop = false;
       this.searchVal = '';
       this.customInfoList = []
       this.getItemList = [];

ghs/src/views/order/add.vue

@@ -102,12 +102,6 @@
       <div class="remark">Enter 确定，Esc 取消</div>
     </el-dialog>
 
-    <el-dialog title="改价" v-if="clearPop" :visible.sync="clearPop" 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>
-      </div>
-    </el-dialog>
-
     <el-dialog title="确认提交" v-if="showCommitPop" :visible.sync="showCommitPop" width="655px" center :close-on-click-modal="false">
       <div>
         <div class="accounts-list">
@@ -264,7 +258,6 @@ export default {
       type:'自提',//取货方式
       payType:'欠款',//结算方式
       showConfirmNum:false,//选择扎和支的弹窗
-      clearPop:false,//修改单价弹窗
       showCommitPop:false,//结账弹窗
       priceAmend:0,//修改单价弹窗
       desk:'',//操作桌面
@@ -724,7 +717,6 @@ export default {
         this.selectIndex = 0
         this.$refs.singleTable.setCurrentRow(this.selectList[0])
       }
-      this.clearPop = false;
       this.searchVal = '';
       this.customInfoList = []
       this.getItemList = [];