Selaa lähdekoodia

Merge remote-tracking branch 'origin/demo_' into demo_

hfxc226 2 vuotta sitten
vanhempi
commit
f6556bc1dc

+ 2 - 2
src/views/repair/application-form/RepairForm.vue

@@ -98,7 +98,7 @@
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleView(record)">维修主页</a>
-            <operation-button
+            <!-- <operation-button
               v-show="allocatedFlag"
               v-if="(DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status)"
               :type="2"
@@ -115,7 +115,7 @@
               v-if="(DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === record.status)"
               :type="2"
               title="是否要拒绝?"
-              @confirm="handleReturn">拒绝</operation-button>
+              @confirm="handleReturn">拒绝</operation-button> -->
             <!-- <operation-button
               v-show="editFlag"
               v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-edit')"

+ 10 - 2
src/views/repair/application-form/modules/DetailRepair.vue

@@ -260,7 +260,7 @@
           </a-table>
         </div>
       </div>
-      <div class="btn">
+      <div class="btn" v-if="model.category!==1">
         <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status " title="是否要接单?" @confirm="receiveRepair">
           <a-button style="margin-left: 8px" type="default">接单</a-button>
         </a-popconfirm>
@@ -284,6 +284,14 @@
         </a-popconfirm>
         <a-button style="margin-left: 8px" type="primary" @click="handleCancel">返回</a-button>
       </div>
+      <div class="btn" v-else>
+        <a-button style="margin-left: 8px" type="primary" @click="handleCancel">返回</a-button>
+        <a-button style="margin-left: 8px" type="primary" >报修审核</a-button>
+        <a-button style="margin-left: 8px" type="primary" >再次发起审核</a-button>
+        <a-button style="margin-left: 8px" type="primary" >维修挂起</a-button>
+        <a-button style="margin-left: 8px" type="primary" >转大修</a-button>
+
+      </div>
     </div>
     <check-form ref="checkForm" @ok="handleOk" />
     <base-out-form ref="outForm" @ok="handleCancel" />
@@ -308,7 +316,7 @@
     <transfer-form ref="transferForm" @ok="handleOk"/>
     <detail-check-new ref="detailCheckNew" @ok="handleVerifyRecordOk"/>
     <repair-record-form ref="repairRecordForm" @ok="handleRepairRecordOk" />
-    <report-up-form ref="reportUpForm" @ok="handleOk" @okk="handleCancel" />
+    <report-up-form ref="reportUpForm" @ok="handleOk" @okk="handleOk" />
     <ticket-form ref="ticketForm" @ok="handleOk" />
     <longYanSelectSpareForm ref="longYanSelectSpareForm" @ok="handleOk"/>
     <scheme-library ref="schemeLibrary" @ok="handleOk"/>

+ 14 - 6
src/views/repair/application-form/modules/TicketForm.vue

@@ -278,9 +278,13 @@
                 <div style="flex:1">确认完工: <span>
                   {{ model.validate }}
                 </span>
-                  <a-button v-if="(!model.validate ||model.validate ==='')" size="small" @click="handleSign('validate')">
-                    签字
-                  </a-button></div>
+                  <operation-button
+                    v-if="(!model.validate ||model.validate ==='')"
+                    :type="2"
+                    :showDivider="false"
+                    title="确定签字?"
+                    @confirm="handleSign('validate')">签字</operation-button>
+                </div>
               </div>
             </td>
           </tr>
@@ -373,9 +377,13 @@
                 <div style="flex:1">主管确认: <span>
                   {{ model.repairManager }}
                 </span>
-                  <a-button v-if="(!model.repairManager ||model.repairManager ==='')" size="small" @click="handleSign('repairManager')">
-                    签字
-                  </a-button></div>
+                  <operation-button
+                    v-if="(!model.repairManager ||model.repairManager ==='')"
+                    :type="2"
+                    title="确定签字?"
+                    :showDivider="false"
+                    @confirm="handleSign('repairManager')">签字</operation-button>
+                </div>
               </div>
             </td>
           </tr>

+ 132 - 0
src/views/repair/application-form/modules/auditFrom.vue

@@ -0,0 +1,132 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    class="ant-modal2"
+    @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="1">
+        <row-item>
+          <a-form-item
+            label="备注"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-radio-group v-model="value" @change="onChange">
+              <a-radio-button :value="1">
+                通过
+              </a-radio-button>
+              <a-radio-button :value="0">
+                拒绝
+              </a-radio-button>
+            </a-radio-group>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="备注"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-textarea
+              :rows="4"
+              v-decorator="['checkContent']"/>
+          </a-form-item>
+        </row-item>
+      </row-list>
+    </a-form>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { examineOk } from '@/api/repair/application-form'
+
+export default {
+  name: 'BaseRepairApplicationForm',
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      form: this.$form.createForm(this),
+      visible: false,
+      // 下拉框map
+      sourceMap: {},
+      levelMap: {},
+      needStopMap: {},
+      descripitionMap: {},
+      statusMap: {},
+      model: null,
+      userList: []
+    }
+  },
+  components: {
+  },
+  props: {
+  },
+  created () {
+    // 下拉框map
+    this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
+    this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      this.model = record
+      // 如果是空标识添加
+      if (this.BaseTool.Object.isBlank(record)) {
+        this.modalTitle = '添加'
+        return
+      }
+      this.modalTitle = '驳回'
+      const { form: { setFieldsValue } } = this
+      // 日期处理
+      record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign(pick(record, [
+          'id'
+        ])))
+      })
+    },
+    save () {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
+          this.confirmLoading = false
+          return
+        }
+        // 日期处理
+        examineOk(0, values)
+          .then(() => {
+            this.handleCancel(values)
+          }).catch(() => {
+            this.confirmLoading = false
+          })
+      })
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.confirmLoading = false
+      this.form.resetFields()
+      if (this.BaseTool.Object.isNotBlank(values)) {
+        this.$emit('ok')
+      }
+    }
+
+  }
+}
+</script>