文案修改

src/components/pages/CanteenManagement/ClassificationOfDishes.vue

@@ -126,7 +126,6 @@ export default {
       })
     },
     changeData (record, index) {
-      console.log(record, index)
       let saveProductCategoryData = {
         orgId: localStorage.getItem('orgId'),
         productCategoryId: this.categoryName,
@@ -171,6 +170,12 @@ export default {
     // 创建菜单
     saveProductCategory () {
       let that = this
+      let reg = '^[0-9]*$'
+      debugger
+      if (!/^[0-9]*$/.test(this.sort)) {
+        this.$message.error('排序值为数字')
+        return false
+      }
       if (this.productCategoryName === '') {
         this.$message.error('分类名称不能为空')
       } else if (this.sort === '') {

src/components/pages/CanteenManagement/ConsumptionOrder.vue

@@ -293,7 +293,7 @@ export default {
 .mingPayOrderDetailItem{
   display: flex;
   width: 190px;
-  margin: 8px 0;
+  margin: 15px 0;
 }
 .mingPayOrderDetailItem > div:nth-of-type(1){
   width: 40px;
@@ -316,16 +316,20 @@ export default {
   text-overflow:ellipsis;/* 超出部分显示省略号 */
   white-space: nowrap;/*规定段落中的文本不进行换行 */
   width: 80px;/*需要配合宽度来使用*/
+  color: black;
 }
 .mingPayOrderDetailItem > div:nth-of-type(2) div:nth-of-type(2){
   overflow: hidden;/*超出部分隐藏*/
   text-overflow:ellipsis;/* 超出部分显示省略号 */
   white-space: nowrap;/*规定段落中的文本不进行换行 */
   width: 80px;/*需要配合宽度来使用*/
+  color: #868686;
+  font-size: 12px;
 }
 .mingPayOrderDetailItem > div:nth-of-type(3){
   height: 40px;
   text-align: right;
   flex: 1;
+  color: black;
 }
 </style>

src/components/pages/CanteenManagement/MenuManagement.vue

@@ -254,6 +254,15 @@ export default {
       })
     },
     saveProduct () {
+      const temp = /^\d+\.?\d{0,2}$/
+      if (!temp.test(this.addProduct.productPrice) || parseFloat(this.addProduct.productPrice) > 1000) {
+        this.$message.error('请输入正确的数字金额，最多保留小数点后两位')
+        return
+      }
+      if (!/^[0-9]*$/.test(this.addProduct.sort)) {
+        this.$message.error('排序值为数字')
+        return false
+      }
       if (!this.addProduct.uploadSuccess || !this.addProduct.productName || !this.addProduct.productPrice || !this.addProduct.productIcon || !this.addProduct.sort) {
         this.$message.error('请完整填写栏目')
         return false

src/components/pages/PaymentManagement/CashierManagement.vue

@@ -10,9 +10,7 @@
     </div>
     <a-table :columns="columns" :dataSource="cashierManagementList" size="default" rowKey="id" :pagination="pagination" @change="handleTableChange">
       <span slot="name">成员</span>
-      <span slot="createDate" slot-scope="createDate">
-        {{ mwUtils.timeToStr(createDate) }}
-      </span>
+      <span slot="createDate"></span>
       <span slot="action" slot-scope="text, record, index">
         <a v-if="record.status === '0'" href="javascript:;" @click="showModel(record, text, index)">删除</a>
         <a v-else href="javascript:;" style="color:#cccccc">已删除</a>
@@ -24,7 +22,6 @@
 <script>
 import { config } from './../../../api/config.js'
 import { $http } from './../../../api/axios.js'
-import { mwUtils } from './../../../lib/utils.js'
 export default {
   name: 'cashierManagement',
   data () {
@@ -44,8 +41,7 @@ export default {
         dataIndex: 'name'
       }, {
         title: '时间',
-        dataIndex: 'createDate',
-        scopedSlots: { customRender: 'createDate' }
+        dataIndex: 'createDate'
       }, {
         title: '操作',
         dataIndex: 'action',

src/components/pages/PaymentManagement/SetAdministrators.vue

@@ -10,9 +10,7 @@
     </div>
     <a-table :columns="columns" :dataSource="cashierManagementList" size="default" rowKey="id" :pagination="pagination" @change="handleTableChange">
       <span slot="name">成员</span>
-      <span slot="createDate" slot-scope="createDate">
-        {{ mwUtils.timeToStr(createDate) }}
-      </span>
+      <span slot="createDate">时间</span>
       <span slot="action" slot-scope="text, record, index">
         <a v-if="record.status === '0'" href="javascript:;" @click="showModel(record, text, index)">删除</a>
         <a v-else href="javascript:;" style="color:#cccccc">已删除</a>
@@ -24,7 +22,6 @@
 <script>
 import { config } from './../../../api/config.js'
 import { $http } from './../../../api/axios.js'
-import { mwUtils } from './../../../lib/utils.js'
 export default {
   name: 'cashierManagement',
   data () {
@@ -44,8 +41,7 @@ export default {
         dataIndex: 'name'
       }, {
         title: '时间',
-        dataIndex: 'createDate',
-        scopedSlots: { customRender: 'createDate' }
+        dataIndex: 'createDate'
       }, {
         title: '操作',
         dataIndex: 'action',

src/components/pages/PaymentManagement/ViewAllowances.vue

@@ -11,9 +11,7 @@
       <span slot="endTime" slot-scope="endTime">
         {{ timeToStr(endTime) }}
       </span>
-      <span slot="createTime" slot-scope="createTime">
-        {{ timeToStr(createTime) }}
-      </span>
+      <span slot="createTime"></span>
     </a-table>
   </div>
 </template>
@@ -41,8 +39,7 @@ export default {
         scopedSlots: { customRender: 'endTime' }
       }, {
         title: '创建日期',
-        dataIndex: 'createTime',
-        scopedSlots: { customRender: 'createTime' }
+        dataIndex: 'createTime'
       }],
       pagination: {
         current: 1,