bug修复

dist/README.md

@@ -1,10 +1,10 @@
-# STATIC
-
-**This directory is not required, you can delete it if you don't want to use it.**
-
-This directory contains your static files.
-Each file inside this directory is mapped to `/`.
-
-Example: `/static/robots.txt` is mapped as `/robots.txt`.
-
-More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).
+# STATIC
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your static files.
+Each file inside this directory is mapped to `/`.
+
+Example: `/static/robots.txt` is mapped as `/robots.txt`.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).

pages/main/index/artificial_order.vue

@@ -9,7 +9,7 @@
         <el-form-item label="订单编号">
           <div class="order-number">
             <span>{{form.orderNo ? form.orderNo : '未生成'}}</span>
-            <span>{{form.orderNo ? `订单编号:${form.orderNo}` : '未生成订单'}}</span>
+            <!-- <span>{{form.orderNo ? `订单编号:${form.orderNo}` : '未生成订单'}}</span>
             <span class="order-status" v-if="form.status === '0'">订单创建</span>
             <span class="order-status" v-else-if="form.status === '100'">待审核</span>
             <span class="order-status" v-else-if="form.status === '101'">审核中</span>
@@ -24,7 +24,7 @@
             <span class="order-status" v-else-if="form.status === '400'">订单支付中</span>
             <span class="order-status" v-else-if="form.status === '401'">订单支付成功</span>
             <span class="order-status" v-else-if="form.status === '402'">订单支付失败</span>
-            <span class="order-status" v-else>未生成</span>
+            <span class="order-status" v-else>未生成</span> -->
           </div>
         </el-form-item>
 
@@ -66,7 +66,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="订单金额" prop="price">
-              <el-input v-model="form.price" placeholder="请输入实际金额"></el-input>
+              <el-input v-model.number="form.price" placeholder="请输入实际金额"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -105,22 +105,22 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目ID">
-              <el-input v-model="form.productId" placeholder="请输入项目ID"></el-input>
+            <el-form-item label="项目ID" prop="productId">
+              <el-input v-model.number="form.productId" placeholder="请输入项目ID"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="关联订单">
+            <el-form-item label="关联订单" prop="originOrderNo">
               <el-input v-model="form.originOrderNo" placeholder="请输入平台订单编号"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-form-item label="外部备注">
+        <el-form-item label="外部备注" prop="publicComment">
           <el-input v-model="form.publicComment" placeholder="请输入用户可见的备注信息"></el-input>
         </el-form-item>
 
-        <el-form-item label="内部备注">
+        <el-form-item label="内部备注" prop="privateComment">
           <quill-editor
             ref="quillEditor"
             class="editer"
@@ -146,6 +146,30 @@
 <script>
 export default {
   data() {
+    let checkPrice = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error("请输入订单金额"))
+      } else if (isNaN(value) || value > 100000) {
+        return callback(new Error("请输入实际金额0-10万元"))
+      } else { 
+        callback()
+      }
+    }
+    let checkProductId = (rule, value, callback) => {
+      if (isNaN(value)) {
+        return callback(new Error("请输入数字"))
+      } else { 
+        callback()
+      }
+    }
+    let checkOriginOrderNo = (rule, value, callback) => {
+      const reg = /^[0-9a-zA-Z]+$/
+      if (!reg.test(value)) {
+        return callback(new Error("请输入数字和字母"))
+      } else { 
+        callback()
+      }
+    }
     return {
       action: "",
       id: "",
@@ -170,10 +194,20 @@ export default {
       saveData: {},
       rules: {
         uid: [{ required: true, message: "请输入用户uid", trigger: "blur" }],
-        productTitle: [{ required: true, max: 25, message: "请输入订单名称，尽量遵守命名规则", trigger: "blur" }],
+        productTitle: [
+          { required: true, message: "请输入订单名称", trigger: "blur" },
+          { max: 25, message: "订单名称最多输入25个字", trigger: "blur" },
+        ],
         productType: [{ required: true, message: "请选择订单类型", trigger: "change" }],
         orderType: [{ required: true, message: "请选择交易类型", trigger: "change" }],
-        price: [{ required: true, message: "请输入实际金额0-10万元", trigger: "blur" }]
+        price: [{ validator: checkPrice, trigger: "blur" }],
+        originOrderNo: [{ validator: checkOriginOrderNo, trigger: "blur" }],
+        productId: [{ validator: checkProductId, trigger: "blur" }],
+        publicComment: [{ max: 50, message: "外部备注最多输入50个字", trigger: "blur" }],
+        privateComment: [
+          { required: true, message: "请输入内部备注", trigger: "blur" },
+          { max: 10000, message: "内部备注最多输入10000个字符", trigger: "blur" },
+        ]
       },
       orderTypes: [],
       productTypes: [],
@@ -336,6 +370,7 @@ export default {
       const isConfirm = true
       for (const key in confirmData) {
         if (confirmData[key] !== saveData[key]) {
+          console.log(confirmData[key],saveData[key])
           this.$message({
             message: '与保存订单不一致，请先保存订单！',
             type: 'warning'
@@ -350,6 +385,9 @@ export default {
             message: "提交成功",
             type: "success"
           })
+          setTimeout(() => {
+            this.$router.push('/main/artificial_orders')
+          }, 1000)
         } else if (res.info) {
           console.log(res.info)
         }