Merge remote-tracking branch 'origin/master'

src/views/basic/product/product.vue

@@ -1545,7 +1545,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
+      this.filterQuery.page = val.page;
       this.getList();
     },
     handleModifyClick(row) {

src/views/diSearch/udiInfoSearch.vue

@@ -80,7 +80,7 @@
             <el-row >
               <el-col :span="12" class="el-col">
                 <el-form-item label="产品类别:">
-                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.cplb"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.hchzsb"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="el-col">
@@ -106,7 +106,7 @@
             <el-row>
               <el-col :span="12" class="el-col">
                 <el-form-item label="器械类别:">
-                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.qxlb"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.cplx"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="el-col">

src/views/register.vue

@@ -661,10 +661,10 @@ export default {
             }
           }
 
-          if(this.$isBlank(this.inputQuery.licenseUrl)){
-            this.$message.error('请先上传营业执照电子档案！');
-            return;
-          }
+          // if(this.$isBlank(this.inputQuery.licenseUrl)){
+          //   this.$message.error('请先上传营业执照电子档案！');
+          //   return;
+          // }
 
           this.loading = true;
           register(this.inputQuery).then((response) => {

src/views/supplier/company/basicCompany.vue

@@ -477,11 +477,11 @@ export default {
                     }
                 });
             } else {                //编辑保存
-               if(val!=6){
-                var str="企业信息已通过审核，是否确认重新提交审核？";
-               }else{
-                var str="是否确定提交保存？";
-               }
+              if(val!=0) {
+                  var str = "企业信息已通过审核，是否确认重新提交审核？";
+                } else {
+                  var str = "是否确定提交保存？";
+                }
                 this.$refs["inputQuery"].validate(valid => {
                     if (valid) {
                         this.$confirm(str, "提示", {

src/views/userManage/registerManage.vue

@@ -274,17 +274,17 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="3">
-                        <div class="div-text">
-                            <span>营业执照:&nbsp;</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="3">
-                        <el-button
-                            @click.native="openFile(rowData.licenseUrl)"
-                            size="small" type="primary">查看文件
-                        </el-button>
-                    </el-col>
+                    <!--<el-col :span="3">-->
+                    <!--    <div class="div-text">-->
+                    <!--        <span>营业执照:&nbsp;</span>-->
+                    <!--    </div>-->
+                    <!--</el-col>-->
+                    <!--<el-col :span="3">-->
+                    <!--    <el-button-->
+                    <!--        @click.native="openFile(rowData.licenseUrl)"-->
+                    <!--        size="small" type="primary">查看文件-->
+                    <!--    </el-button>-->
+                    <!--</el-col>-->
                 </el-row>
 
 
@@ -296,7 +296,7 @@
                             <span>分配角色:&nbsp;</span>
                         </div>
                     </el-col>
-                    <el-col :span="7">
+                    <el-col :span="10">
                         <el-form :model="checkQuery">
                             <el-form-item label="" style="margin-top: 5px">
                                 <el-radio-group v-model="check" @change="handleCheckedChange">