Merge branch 'master' of http://git.cc-lotus.info/Consumables/admin-cms-two

src/views/menu/apply_examine/parts/info-1.vue

@@ -5,7 +5,7 @@
         <data-form :fields="fields" :data="form" :needSave="false">
           <template #custom="{ item }">
             <template v-if="item.model === 'order'">
-              <data-table :fields="orderField" :opera="opera" :data="form.order" :usePage="false"> </data-table>
+              <data-table :fields="orderField" :opera="[]" :data="form.order" :usePage="false"> </data-table>
             </template>
           </template>
         </data-form>
@@ -28,7 +28,7 @@ export default {
         { label: '电话', model: 'user_phone' },
         { label: '审核人', model: 'examine_name' },
         { label: '审核时间', model: 'examine_date' },
-        { label: '审核意见', model: 'examine_desc' },
+        { label: '审核意见', model: 'examine_desc', type: 'textarea', readonly: true },
         { label: '商品列表', model: 'order', custom: true },
       ],
       // 商品列表
@@ -37,7 +37,6 @@ export default {
         { label: '商品数量', prop: 'num' },
         { label: '特殊说明', prop: 'desc' },
       ],
-      opera: [],
     };
   },
   created() {},

src/views/menu/apply_review/parts/info-1.vue

@@ -5,7 +5,7 @@
         <data-form :fields="fields" :data="form" :needSave="false">
           <template #custom="{ item }">
             <template v-if="item.model === 'order'">
-              <data-table :fields="orderField" :opera="opera" :data="form.order" :usePage="false"> </data-table>
+              <data-table :fields="orderField" :opera="[]" :data="form.order" :usePage="false"> </data-table>
             </template>
           </template>
         </data-form>
@@ -28,7 +28,7 @@ export default {
         { label: '电话', model: 'user_phone' },
         { label: '审核人', model: 'examine_name' },
         { label: '审核时间', model: 'examine_date' },
-        { label: '审核意见', model: 'examine_desc' },
+        { label: '审核意见', model: 'examine_desc', type: 'textarea', readonly: true },
         { label: '商品列表', model: 'order', custom: true },
       ],
       // 商品列表
@@ -37,7 +37,6 @@ export default {
         { label: '商品数量', prop: 'num' },
         { label: '特殊说明', prop: 'desc' },
       ],
-      opera: [],
     };
   },
   created() {},

src/views/menu/market_buy/index.vue

@@ -22,6 +22,7 @@
 </template>
 
 <script>
+const { apply_status } = require('@common/src/layout/deploy/dict');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const moment = require('moment');
 export default {
@@ -71,14 +72,7 @@ export default {
       dialog: { title: '详细信息', show: false, type: '1' },
       form: { order: [] },
       // 状态
-      statusList: [
-        { value: '0', label: '待审中' },
-        { value: '1', label: '通过' },
-        { value: '-1', label: '拒绝' },
-        { value: '2', label: '有货，可领取' },
-        { value: '3', label: '无货，需采买' },
-        { value: '4', label: '领取确认完成' },
-      ],
+      statusList: apply_status,
     };
   },
   async created() {

src/views/menu/type/index.vue

@@ -13,8 +13,8 @@
     </el-row>
     <e-dialog :dialog="dialog" @toClose="toClose">
       <template slot="info">
-        <detail-1 v-if="dialog.type == '1'" :form="form" @onSubmit="onSubmit"></detail-1>
-        <info-1 :form="info" v-else></info-1>
+        <detail-1 v-if="dialog.type == '1'" :form="form" @toSave="toSave"></detail-1>
+        <info-1 v-else-if="dialog.type == '2'" :form="form"></info-1>
       </template>
     </e-dialog>
   </div>
@@ -31,7 +31,6 @@ export default {
   },
   data: function () {
     return {
-      // 数据项
       fields: [
         { label: '类型类别', prop: 'code', filter: true },
         { label: '类型名称', prop: 'name', filter: true },
@@ -41,7 +40,6 @@ export default {
         { label: '详情', method: 'view' },
         { label: '修改', method: 'edit' },
       ],
-      // 列表
       list: [
         { id: '1115', code: '5', name: '水彩笔5' },
         { id: '1116', code: '6', name: '水彩笔6' },
@@ -49,10 +47,8 @@ export default {
       ],
       // 弹框
       dialog: { title: '信息管理', show: false, type: '1' },
-      // 添加表单
+      // 表单
       form: {},
-      //详情
-      info: {},
     };
   },
   created() {},
@@ -63,13 +59,12 @@ export default {
       this.dialog = { title: '信息管理', show: true, type: '1', widths: '40%' };
     },
     // 提交保存
-    onSubmit(data) {
+    toSave({ data }) {
       console.log(data);
-      // this.toClose();
     },
     // 详细信息
     toView({ data }) {
-      this.$set(this, `info`, data);
+      this.$set(this, `form`, data);
       this.dialog = { title: '详细信息', show: true, type: '2', widths: '40%' };
     },
     // 信息变更
@@ -79,6 +74,7 @@ export default {
     },
     // 关闭弹框
     toClose() {
+      this.form = {};
       this.dialog = { show: false };
     },
   },

src/views/menu/type/parts/detail-1.vue

@@ -31,7 +31,7 @@ export default {
   created() {},
   methods: {
     toSave({ data }) {
-      this.$emit('onSubmit', data);
+      this.$emit('toSave', { data: data });
     },
   },
   computed: {

src/views/menu/type/parts/info-1.vue

@@ -2,7 +2,7 @@
   <div id="info-1">
     <el-row>
       <el-col :span="24" class="main">
-        <data-form :fields="fields" :data="form" :rules="rules" :needSave="false"> </data-form>
+        <data-form :fields="fields" :data="form" :rules="{}" :needSave="false"> </data-form>
       </el-col>
     </el-row>
   </div>
@@ -22,7 +22,6 @@ export default {
         { label: '类型类别', model: 'code', readonly: true },
         { label: '类型名称', model: 'name', readonly: true },
       ],
-      rules: {},
     };
   },
   created() {},