9.12

fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue

@@ -192,8 +192,8 @@
           重置
         </div>
         <div class="d-s">
-          <div class="anniu-lv">取单</div>
-          <div class="anniu-lan">挂单</div>
+          <div class="anniu-lv" @click="invokePickUpTheOrder" >取单</div>
+          <div class="anniu-lan" @click="invokeHangingAnOrder" >挂单</div>
         </div>
       </div>
     </div>
@@ -324,7 +324,7 @@
     >
       <accountPending></accountPending>
       <span slot="footer" class="dialog-footer">
-             <el-button @click="accountPending = false">取 消</el-button>
+    <el-button @click="accountPending = false">取 消</el-button>
     <el-button type="primary" @click="accountPending = false">确 定</el-button>
       </span>
     </el-dialog>
@@ -340,7 +340,20 @@
              <el-button type="primary" @click="memberRecharge = false">确认充值</el-button>
       </span>
     </el-dialog>
-
+    <el-dialog
+      title="加油金额"
+      :visible.sync="refuelingAmount"
+      width="542px"
+      center
+    >
+      <div class="tc-box">
+        <refuelingAmount></refuelingAmount>
+      </div>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="refuelingAmount = false">取 消</el-button>
+    <el-button type="primary" @click="refuelingAmount = false">确 定</el-button>
+  </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -348,6 +361,7 @@
 import pickUp from './newHomeComponents/pickUpTheOrder.vue'
 import accountPending from './newHomeComponents/accountPending.vue'
 import memberRecharge from './newHomeComponents/memberRecharge.vue'
+import refuelingAmount from './newHomeComponents/refuelingAmount.vue'
 export default {
   data() {
     return {
@@ -437,6 +451,7 @@ export default {
           {min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur'}
         ],
       },
+      refuelingAmount: false,
       hangingAnOrder: false,
       paymentResults: false,
       pickUpTheOrder: false,
@@ -448,12 +463,19 @@ export default {
   components:{
     pickUp,
     accountPending,
-    memberRecharge
+    memberRecharge,
+    refuelingAmount
   },
   mounted() {
     this.restaurants = this.loadAll();
   },
   methods: {
+    invokePickUpTheOrder(){
+      this.pickUpTheOrder = true
+    },
+    invokeHangingAnOrder(){
+      this.hangingAnOrder = true
+    },
     addVip(){
       this.newMember = true
     },

fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue

@@ -0,0 +1,80 @@
+<script >
+export default {
+  data() {
+    return {
+      ruleForm: {
+        name: '',
+        region: '',
+        date1: '',
+        date2: '',
+        delivery: false,
+        type: [],
+        resource: '',
+        desc: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
+        region: [
+          { required: true, message: '请选择活动区域', trigger: 'change' }
+        ],
+        date1: [
+          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        date2: [
+          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        ],
+        type: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        ],
+        resource: [
+          { required: true, message: '请选择活动资源', trigger: 'change' }
+        ],
+        desc: [
+          { required: true, message: '请填写活动形式', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  methods: {
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert('submit!');
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+
+      <el-input v-model="ruleForm.name">
+        <template slot="append">元</template>
+      </el-input>
+
+
+
+
+
+    </el-form>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.hui-size{
+  font-size: 12px;
+  color: #999999;
+}
+</style>