维修

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

@@ -1,18 +1,13 @@
 <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 v-if="$auth('repair-application-forms-assign') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.UN_ALLOCATED === model.status)" style="margin-left: 8px" type="primary" @click="handleAssgin">分配</a-button>
-          <a-popconfirm v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要接收？" @confirm="receive">
-            <a-button>接收</a-button>
-          </a-popconfirm>
-          <a-button v-if="$auth('repair-application-forms-dispatch') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" style="margin-left: 8px" type="primary" @click="handleDispatch">转派</a-button>
-          <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="primary" @click="handleFinish()">维修完成</a-button>
-          <!--          <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="primary" @click="handleSparePick">领用备件</a-button>-->
-          <a-button style="margin-left: 8px" @click="handleCancel">返回</a-button>
-        </span>
-      </a-col>
+       <a-col :md="48" :sm="48">
+         <span class="table-page-search-submitButtons" style="float: right">
+           <a-button v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="primary" @click="handleApprove()">验收</a-button>
+           <a-button v-if="$auth('repair-application-forms-reback') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="danger" @click="handleReturn()">驳回</a-button>
+           <a-button style="margin-left: 8px" @click="handleCancel">返回</a-button>
+         </span>
+       </a-col>
     </a-row>
     <a-layout>
       <a-layout-content style="background-color: rgb(255, 255, 255)">
@@ -36,7 +31,7 @@
           <upload-image-detail :images-list="model.applicationFileList"/>
         </detail-list>
         <a-divider orientation="left">维修详情</a-divider>
-        <detail-list title="" :col="3">
+        <detail-list title=""  :col="3">
           <detail-list-item term="故障类别">{{ model.repairErrorTypeName }}</detail-list-item>
           <detail-list-item term="维修开始时间">{{ model.repairStartTime }}</detail-list-item>
           <detail-list-item term="维修结束时间">{{ model.repairEndTime }}</detail-list-item>
@@ -113,10 +108,10 @@
       <q-tab-pane key="b" tab="备件领用">
         <spare-pick-form-select-table :type="1" :table-params="{repairId: model.id, repairNo: model.no}" ref="sparePickFormSelectTable"/>
       </q-tab-pane>
-    </q-tabs>
+    </q-tabs>-->
     <check-form ref="checkForm" @ok="handleOk" />
     <finish-form ref="finishForm" @ok="handleOk" />
-    <dispatch-form ref="dispatchForm" @ok="handleCancel" />-->
+    <dispatch-form ref="dispatchForm" @ok="handleCancel" />
   </a-card>
 </template>
 
@@ -311,12 +306,12 @@ export default {
       })
     },
     handleFinish () {
-      const modal = this.$refs.finishForm
-      modal.base(this.model)
+        const modal = this.$refs.finishForm
+        modal.base(this.model)
     },
     handleDispatch () {
-      const modal = this.$refs.dispatchForm
-      modal.base(this.model)
+        const modal = this.$refs.dispatchForm
+        modal.base(this.model)
     },
     changeTab (activeKey) {
       this.activeKey = activeKey

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

@@ -4,7 +4,7 @@
       <a-col :md="48" :sm="48">
         <span class="table-page-search-submitButtons" style="float: right">
           <a-button v-if="$auth('repair-application-forms-assign') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status" type="primary" @click="handleAssign">派工</a-button>
-          <a-popconfirm v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要接收？" @confirm="receive">
+          <a-popconfirm v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要接收？" @confirm="receive">
             <a-button>接收</a-button>
           </a-popconfirm>
           <a-button v-if="$auth('repair-application-forms-dispatch') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" style="margin-left: 8px" type="primary" @click="handleDispatch">转派</a-button>

src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -19,16 +19,16 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="状态">
-                  <a-select default-value="待办" v-model="queryParam.status" placeholder="请选择">
+                  <a-select :default-value="1" v-model="queryParam.status" placeholder="请选择">
                     <a-select-option
                       :key="1"
                       label="待办"
-                      value="1">待办
+                      :value="1">待办
                     </a-select-option>
                     <a-select-option
                       :key="2"
                       label="已办"
-                      value="2">已办
+                      :value="2">已办
                     </a-select-option>
                   </a-select>
                 </a-form-item>