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

pages/meter-contract/contract-review/MeterContractReview.vue

@@ -46,6 +46,7 @@
       </div>
     </div>
     <FileManage ref="FileManage"></FileManage>
+    <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
     <MeterSendOperation ref="operationModal"></MeterSendOperation>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
     <MeterSubcontractorAddEdit ref="addEditModal"></MeterSubcontractorAddEdit>
@@ -53,6 +54,7 @@
 </template>
 <script>
 import { meterContract, meterSubcontractor } from '../../../api'
+import Reason from '../../../components/base/Reason'
 import MeterSubcontractorEdit from './MeterContractReviewEdit'
 import MeterSubcontractorAddEdit from './MeterContractReviewAddEdit'
 import MeterSendOperation from './MeterContractReviewOperation'
@@ -60,7 +62,8 @@ export default {
   components: {
     MeterSubcontractorEdit,
     MeterSendOperation,
-    MeterSubcontractorAddEdit
+    MeterSubcontractorAddEdit,
+    Reason
   },
   data() {
     return {
@@ -72,6 +75,11 @@ export default {
           type: 'success',
           id: '',
           name: '评审'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '驳回'
         }
       ],
       iconMsg: [
@@ -138,6 +146,9 @@ export default {
           case '评审':
             this._editModal(false)
             break
+          case '驳回':
+            this._goBack()
+            break
           case '提交':
             this._submitToReview()
             break
@@ -147,6 +158,32 @@ export default {
         }
       })
     },
+    _goBack() {
+      // 退回
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条委托！')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    // _reportCheckBack: async function(data) {
+    //   const result = await meterContract.checkSecond({
+    //     ids: this.selectIds,
+    //     remark: data
+    //   })
+    //
+    //   if (result) {
+    //     this.$Message.success('退回成功！')
+    //     await this._page()
+    //   }
+    // },
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        // this._reportCheckBack(data)
+        console.log('退回')
+      }
+      console.log(data)
+    },
     _iconClick(res, data, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-contract/contract-review/MeterContractReviewAddEdit.vue

 <template>
   <div>
-    <Modal v-model="showModal" :mask-closable="false" width="600">
+    <Modal v-model="showModal" :mask-closable="false" width="1000">
       <p slot="header">{{modalTitle}}</p>
       <div>
-        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
-          <Form-item  label="委托单位" prop="client" style="width: 100%">
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="110" labelPosition="left" inline>
+          <Form-item  label="委托单位" prop="client" style="width: 100%;margin-bottom: 5px;">
             <AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
                           name="client" placeholder="请输入或选择委托单位"
             ></AutoComplete>
           </Form-item>
-          <Form-item label="项目、内容" prop="content" style="width: 100%">
+          <Form-item label="项目、内容" prop="content" style="width: 100%;margin-bottom: 5px;">
             <Input v-model="formObj.content" name="content" placeholder="请输入项目或内容"/>
           </Form-item>
-          <Form-item label="评审人员" prop="person" style="width: 100%">
+          <Form-item label="评审人员" prop="person" style="width: 100%;margin-bottom: 5px;">
             <Input v-model="formObj.person" name="person" placeholder="请输入评审人员"/>
           </Form-item>
-          <Form-item  style="width: 100%;padding-left: 180px;">
-            <span style="font-weight: bold">评审内容</span>
-          </Form-item>
-            <Form-item label="检定/校准执行规程/规范：" prop="requirements" style="width: 100%">
-              <Input v-model="formObj.requirements" :rows="3" name="requirements" type="textarea" placeholder="请输入要求"/>
+            <Form-item label="检定/校准执行规程/规范：" prop="requirements" style="width: 100%;margin-bottom: 5px;">
+              <Input v-model="formObj.requirements" :rows="2" name="requirements" type="textarea" placeholder="请输入要求"/>
             </Form-item>
-            <Form-item label="要求完成时间" prop="odate" style="width: 100%">
+            <Form-item label="要求完成时间" prop="odate" style="width: 100%;margin-bottom: 5px;">
               <Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
                            placeholder="请选择要求完成时间"></Date-picker>
             </Form-item>
-          <Form-item label="资质能否满足要求" prop="aptitude" class="width-48">
+          <Form-item label="资质能否满足要求" prop="aptitude" class="width-48" style="margin-bottom: 0px;">
             <RadioGroup v-model="formObj.aptitude">
               <Radio :label="item.value" v-for="item in menusList" :key="item.name">&nbsp;{{item.name}}
               </Radio>
             </RadioGroup>
           </Form-item>
-          <Form-item label="设备及环境条件是否满足要求" prop="facility" class="width-48">
+          <Form-item label="设备及环境条件是否满足要求" prop="facility" class="width-48" style="margin-bottom: 0px;">
             <RadioGroup v-model="formObj.facility">
               <Radio :label="item.value" v-for="item in menusList" :key="item.name">&nbsp;{{item.name}}
               </Radio>
             </RadioGroup>
           </Form-item>
-          <Form-item label="规程/规范是否符合客户要求" prop="standard" class="width-48" >
+          <Form-item label="规程/规范是否符合客户要求" prop="standard" class="width-48" style="margin-bottom: 0px;">
             <RadioGroup v-model="formObj.standard">
               <Radio :label="item.value" v-for="item in menusList" :key="item.name">&nbsp;{{item.name}}
               </Radio>
             </RadioGroup>
           </Form-item>
-          <Form-item label="人员是否具有能力" prop="power" class="width-48">
+          <Form-item label="人员是否具有能力" prop="power" class="width-48" style="margin-bottom: 0px;">
             <RadioGroup v-model="formObj.power">
               <Radio :label="item.value" v-for="item in menusList" :key="item.name">&nbsp;{{item.name}}
               </Radio>
             </RadioGroup>
           </Form-item>
-          <Form-item label="是否需要分包和分包方的能力评审" prop="subpackage" class="width-48">
+          <Form-item label="是否需要分包和分包方的能力评审" prop="subpackage" class="width-48" style="margin-bottom: 0px;">
             <RadioGroup v-model="formObj.subpackage">
               <Radio :label="item.value" v-for="item in menusList" :key="item.name">&nbsp;{{item.name}}
               </Radio>
             </RadioGroup>
           </Form-item>
-          <Form-item label="是否能在客户要求的时间内完成" prop="setTime" class="width-48">
+          <Form-item label="是否能在客户要求的时间内完成" prop="setTime" class="width-48" style="margin-bottom: 0px;">
             <RadioGroup v-model="formObj.setTime">
               <Radio :label="item.value" v-for="item in menusList" :key="item.name">&nbsp;{{item.name}}
               </Radio>
             </RadioGroup>
           </Form-item>
-          <Form-item label="其他问题的解决" prop="other" style="width: 99.8%">
-            <Input v-model="formObj.other" :rows="3" name="other" type="textarea"
+          <Form-item label="其他问题的解决" prop="other" style="width: 99.8%;margin-bottom: 5px;" >
+            <Input v-model="formObj.other" :rows="2" name="other" type="textarea"
                    placeholder="请输入解决的问题"/>
           </Form-item>
-          <Form-item label="评审结论" prop="verdict" style="width: 99.8%">
-            <Input v-model="formObj.verdict" :rows="3" name="verdict" type="textarea"
+          <Form-item label="评审结论" prop="verdict" style="width: 99.8%;margin-bottom: 5px;">
+            <Input v-model="formObj.verdict" :rows="2" name="verdict" type="textarea"
                    placeholder="请输入评审结论"/>
           </Form-item>
-          <Form-item label="评审日期" prop="reviewTime" style="width: 100%">
+          <Form-item label="评审日期" prop="reviewTime" style="width: 100%;margin-bottom: 5px;">
             <Date-picker @on-change="_reviewTime" type="date" split-panels style="width:100%;"
                          placeholder="请选择评审"></Date-picker>
           </Form-item>
-          <Form-item label="备注：" prop="remark" style="width: 99.8%">
-            <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
+          <Form-item label="备注：" prop="remark" style="width: 99.8%;margin-bottom: 5px;">
+            <Input v-model="formObj.remark" :rows="2" name="remark" type="textarea"
                    placeholder="请输入备注"/>
           </Form-item>
         </Form>