完善

src/views/operate/customer/CustomerInfo.vue

@@ -3,53 +3,21 @@
     <div v-show="visible">
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
-          <a-row :gutter="48" v-show="advanced">
+          <a-row :gutter="48">
             <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
                 <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称" />
               </a-form-item>
             </a-col>
-          </a-row>
-          <a-row :gutter="48">
-            <a-col :md="24 || 24" :sm="24" style="text-align: right">
+            <a-col :md="6 || 24" :sm="24" style="text-align: right">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-                <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'" />
-                </a>
               </span>
             </a-col>
           </a-row>
         </a-form>
       </div>
-
-      <div class="table-operator" style="margin-bottom: 8px;">
-        <a-row>
-          <a-col :md="16">
-            <a-button v-if="$auth('operate-customers-add')" type="primary" icon="plus" @click="handleAdd()">新增
-            </a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('operate-customers-export')" type="primary" icon="download"
-                      @click="doExport">导出
-            </a-button>
-            <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('operate-customers-del')">
-              <a-menu slot="overlay">
-                <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
-                  <a-menu-item key="1">
-                    <a-icon type="delete" />
-                    <a>删除</a></a-menu-item>
-                </a-popconfirm>
-              </a-menu>
-              <a-button style="margin-left: 8px">
-                批量操作
-                <a-icon type="down" />
-              </a-button>
-            </a-dropdown>
-          </a-col>
-        </a-row>
-      </div>
-
       <s-table
         ref="table"
         size="default"
@@ -60,17 +28,18 @@
         :rowSelection="options.rowSelection"
         showPagination="auto"
       >
+        <template #status="text">
+          <a-tag :color="text?'#108ee9':''">
+            {{ text?'已处理':'未处理' }}
+          </a-tag>
+        </template>
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleView(record)">查看</a>
             <operation-button
-              v-if="$auth('operate-customers-edit')" @click="handleEdit(record)"
-            >修改</operation-button>
-            <operation-button
-              v-if="$auth('operate-customers-del')"
-              :type="2"
-              title="是否要删除该条数据？"
-              @confirm="batchDelete(record.id)">删除</operation-button>
+              v-if="$auth('operate-customers-edit')"
+              @click="handleEdit(record)"
+            >处理</operation-button>
           </template>
         </span>
       </s-table>
@@ -121,18 +90,10 @@ export default {
           title: '邮箱',
           dataIndex: 'email'
         },
-        {
-          title: '提交信息',
-          dataIndex: 'content'
-        },
         {
           title: '城市',
           dataIndex: 'city'
         },
-        {
-          title: '处理备注',
-          dataIndex: 'remark'
-        },
         {
           title: '姓名',
           dataIndex: 'createdUserName'
@@ -142,8 +103,9 @@ export default {
           dataIndex: 'createdTime'
         },
         {
-          title: '状态 0 已提交 1 已处理',
-          dataIndex: 'status'
+          title: '状态',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' }
         },
         {
           title: '操作',
@@ -161,7 +123,7 @@ export default {
           ...this.queryParam,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'created_time'
           }
         }
         return getCustomerInfoPage(Object.assign(parameter, this.queryParam))
@@ -174,7 +136,8 @@ export default {
 
       options: {
         alert: {
-          show: true, clear: () => {
+          show: true,
+          clear: () => {
             this.selectedRowKeys = []
           }
         },
@@ -195,7 +158,8 @@ export default {
       if (!this.optionAlertShow) {
         this.options = {
           alert: {
-            show: true, clear: () => {
+            show: true,
+            clear: () => {
               this.selectedRowKeys = []
             }
           },
@@ -243,7 +207,6 @@ export default {
       modal.base()
     },
     handleEdit (record) {
-      this.visible = false
       fetchCustomerInfo({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
         modal.base(res.data)

src/views/operate/customer/modules/BaseForm.vue

@@ -1,107 +1,30 @@
 <template>
-  <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
-    <a-row :gutter="48" slot="extra">
-      <a-col :md="48" :sm="48">
-        <span class="table-page-search-submitButtons" style="float: right">
-          <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-          <a-button style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
-        </span>
-      </a-col>
-    </a-row>
+  <a-modal
+    :visible="visible"
+    class="card"
+    title="处理"
+    :confirm-loading="confirmLoading"
+    @ok="save"
+    @cancel="handleCancel">
     <a-form :form="form">
-
       <a-form-item v-show="false">
         <a-input v-decorator="['id']" type="hidden" />
       </a-form-item>
-
-      <row-list :col="2">
-        <row-item>
-
-          <a-form-item
-            label="公司"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['companyName', {rules: [{required: true, message: '公司不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="电话"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['phone', {rules: [{required: true, message: '电话不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="邮箱"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['email', {rules: [{required: true, message: '邮箱不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="提交信息"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="城市"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['city', {rules: [{required: true, message: '城市不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="处理备注"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['remark', {rules: [{required: true, message: '处理备注不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="状态 0 已提交 1 已处理"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 100%"
-              :min="0"
-              :formatter="BaseTool.Amount.formatter"
-              :parser="BaseTool.Amount.parser"
-              v-decorator="['status', {rules: [{required: true, message: '状态 0 已提交 1 已处理不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-      </row-list>
+      <a-form-item
+        label="处理备注"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-textarea
+          v-decorator="['remark', {rules: [{required: true, message: '处理备注不能为空'}]}]" />
+      </a-form-item>
     </a-form>
-  </a-card>
+  </a-modal>
 </template>
 
 <script>
 import pick from 'lodash.pick'
-import { addCustomerInfo, updateCustomerInfo } from '@/api/operate/customer'
+import { updateCustomerInfo } from '@/api/operate/customer'
 
 export default {
   name: 'BaseCustomerInfo',
@@ -151,21 +74,12 @@ export default {
           return
         }
         // 日期处理
-        if (this.BaseTool.String.isBlank(values.id)) {
-          addCustomerInfo(values)
-            .then(() => {
-              this.handleCancel(values)
-            }).catch(() => {
+        updateCustomerInfo(values)
+          .then(() => {
+            this.handleCancel(values)
+          }).catch(() => {
             this.confirmLoading = false
           })
-        } else {
-          updateCustomerInfo(values)
-            .then(() => {
-              this.handleCancel(values)
-            }).catch(() => {
-            this.confirmLoading = false
-          })
-        }
       })
     },
     handleCancel (values) {

src/views/operate/customer/modules/Detail.vue

@@ -11,16 +11,17 @@
       <detail-list-item term="公司">{{ model.companyName }}</detail-list-item>
       <detail-list-item term="电话">{{ model.phone }}</detail-list-item>
       <detail-list-item term="邮箱">{{ model.email }}</detail-list-item>
-      <detail-list-item term="提交信息">{{ model.content }}</detail-list-item>
       <detail-list-item term="城市">{{ model.city }}</detail-list-item>
-      <detail-list-item term="处理备注">{{ model.remark }}</detail-list-item>
       <detail-list-item term="提交人ID">{{ model.createdUserId }}</detail-list-item>
       <detail-list-item term="审核人ID">{{ model.updateUserId }}</detail-list-item>
       <detail-list-item term="处理人">{{ model.updateUserName }}</detail-list-item>
       <detail-list-item term="处理时间">{{ model.updateTime }}</detail-list-item>
-      <detail-list-item term="状态 0 已提交 1 已处理">{{ model.status }}</detail-list-item>
+      <detail-list-item term="状态">{{ model.status?'已处理':'未处理' }}</detail-list-item>
+      <detail-list-item term="提交信息">{{ model.content }}</detail-list-item>
+      <detail-list-item term="处理备注">{{ model.remark }}</detail-list-item>
+
     </detail-list>
-  </a-card>
+    </detail></a-card>
 </template>
 
 <script>

src/views/repair/application-form/modules/DetailRepair.vue

@@ -193,6 +193,7 @@
                 :data-source="record.detailList"
                 :columns="columnsSpare"
                 tableLayout="auto"
+                :pagination="false"
                 rowKey="id">
               </a-table>
             </div>