jsk

src/api/certificateManage/index.js

@@ -164,6 +164,18 @@ export function getSysUserListApi(data) {
     params:data
   })
 }
+
+export function getApplyUserListApi(data) {
+  return request({
+    url: '/certificate/certificate_check/certificateCheck/applyUserlist',
+    method: 'get',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}
+
 export function getDevicelistApi(data) {
   return request({
     url: '/certificate/certificate_returnmanage/certificateSave/devicelist',

src/views/certificate/certificateManage/certificateInfo/index.vue

@@ -425,7 +425,7 @@
                 // 是否显示弹出层
                 open: false,
                 checked: false,
-                isCreateFlage:true,
+                isCreateFlage:false,
                 userNameFlage:false,
                 certificateNos:[],
                 userIds:[],

src/views/certificate/certificateReturnManage/certificateRequest/index.vue

@@ -123,6 +123,14 @@
       <!-- 添加或修改参数配置对话框 -->
       <el-dialog :title="title+''" :visible.sync="open" width="900px" append-to-body>
         <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="120px" style="height: 650px;overflow-y: auto;">
+          <el-row>
+              <el-form-item  label-width="120px" label="申请类型"  prop="applyType">
+                <el-radio-group v-model="baseForm.applyType" size="small">
+                  <el-radio @change="handleRadioChange('1')" label="1">存证</el-radio>
+                  <el-radio @change="handleRadioChange('2')" label="2">取证</el-radio>
+                </el-radio-group>
+              </el-form-item>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="申请人" prop="name">
@@ -275,7 +283,7 @@
           <el-row>
             <el-col :span="24">
                 <el-form-item label="手机号码" prop="phone">
-                    <el-input style="width: 100%;background-color:#DAE1EE;" v-model="baseForm2.phone" readonly="true" maxlength="30" clearable/>
+                    <el-input style="width: 100%;background-color:#DAE1EE;" v-model="baseForm2.phone" readonly maxlength="30" clearable/>
                 </el-form-item>
             </el-col>
           </el-row>
@@ -302,7 +310,7 @@
   <script>
     import { getUser } from '@/api/system/user'
     import { getCertificateApplyListPageApi,addCertificateApplyApi, editCertificateApplyApi,
-     delCertificateApplyApi,getSysUserListApi,addCertificateCheckApi } from "@/api/certificateManage/index";
+     delCertificateApplyApi,getSysUserListApi,getApplyUserListApi,addCertificateCheckApi } from "@/api/certificateManage/index";
     import base64 from 'base-64';
     import { getToken } from '@/utils/auth'
     import { downloadFileByUrl } from '@/utils/download'
@@ -365,6 +373,7 @@
                     startTime:"",
                     startTime:"",
                     endTime:"",
+                    applyType:"1",
                     dateRange:[]
                 },
                 isView:false,
@@ -572,10 +581,21 @@
                 this.open = false;
                 this.reset();
             },
+            handleRadioChange(val){
+              // const param={"applyType":val}
+              // getApplyUserListApi(param).then(response => {
+              //   console.log("response",response);
+              //   this.allUserList=response;
+              //   this.$set(this.baseForm2,"userId",this.baseForm.userId)
+              //   this.$set(this.baseForm2,"phone",this.baseForm.phone)
+              // });
+            },
             //选择人员
             handleSelect(){
               this.openSelectUser = true;
-              getSysUserListApi({}).then(response => {
+              console.log("this.baseForm",this.baseForm);
+              const param={"applyType":this.baseForm.applyType}
+              getApplyUserListApi(param).then(response => {
                 console.log("response",response);
                 this.allUserList=response;
                 this.$set(this.baseForm2,"userId",this.baseForm.userId)

src/views/certificate/device/index.vue

@@ -145,7 +145,7 @@
                 </el-col>
                 <el-col :span="12">
                     <el-form-item label="功能接口" prop="funImp">
-                    <el-input  v-model="baseForm.funImp" placeholder="请输入功能接口" maxlength="30" clearable/>
+                    <el-input  v-model="baseForm.funImp" placeholder="http://xxx.xxx.xxx:8088/externaltask/accessfunction" maxlength="30" clearable/>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -254,7 +254,8 @@
                     deviceAddr:"",
                     deviceMac:"",
                     deviceGateway:"",
-                    devicePwd:""
+                    devicePwd:"",
+                    funImp:"http://xxx.xxx.xxx:8088/externaltask/accessfunction"
                 },
                 // 表单校验
                 baseFormRules: {
@@ -377,7 +378,8 @@
                     deviceAddr:"",
                     deviceMac:"",
                     deviceGateway:"",
-                    devicePwd:""
+                    devicePwd:"",
+                    funImp:"http://xxx.xxx.xxx:8088/externaltask/accessfunction"
                 };
                 this.resetForm("baseForm");
             },