基础信息相关界面修改

src/views/basic/product/dict/UdiBasicProduct.vue

@@ -85,7 +85,7 @@
       >
         <selectLocalUdi
           :closeDialog="closeDialog"
-          filter-type="1"
+          filterType="1"
           :companyId="filterQuery.companyIdFk"
         ></selectLocalUdi>
       </el-dialog>

src/views/basic/product/rel/UdiInfoSelectLocalUdi.vue

@@ -377,6 +377,7 @@ export default {
       combineQuery: {
         companyId: null,
         keys: [],
+        products: [],
       },
       checked: true,
       udidlList: [],
@@ -616,6 +617,13 @@ export default {
           });
 
       } else if (this.filterType == 2) {//注册企业医疗器械信息关联
+        debugger
+        for (let uuid of this.combineQuery.keys) {
+          let data = {
+            uuid: uuid
+          };
+          this.combineQuery.products.push(data);
+        }
         batchCombine(this.combineQuery)
           .then((response) => {
             this.combineLoading = false;

src/views/basic/product/rel/UdiRlCompany.vue

@@ -18,7 +18,7 @@
               >
                 <el-option
                   v-for="item in fromOptions"
-                  :key="item.companyName"
+                  :key="item.id"
                   :label="item.companyName"
                   :value="item.id"
                 >
@@ -121,13 +121,14 @@
         v-if="selectProductVisible"
       >
         <selectLocalUdi
+          filterType="2"
           :closeDialog="closeDialog"
           :companyId="filterQuery.companyIdFk"
         ></selectLocalUdi>
       </el-dialog>
 
       <el-dialog
-        title="医疗器械信息-编辑"
+        title="企业医疗器械信息-编辑"
         :visible.sync="editDiDialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -387,7 +388,7 @@ export default {
       seachCompany(cQuery)
         .then((response) => {
           this.loading = false;
-          this.fromOptions = response.data || [];
+          this.fromOptions = response.data.list || [];
         })
         .catch(() => {
           this.loading = false;

src/views/basic/product/rel/productEdit.vue

@@ -17,6 +17,7 @@
               <el-input
                 style="width: 80%"
                 size="small"
+                disabled
                 splaceholder="请输入内容"
                 v-model="detailQuery.companyName"
               ></el-input>
@@ -34,7 +35,33 @@
                 <el-option label="代理商" :value="2"></el-option>
                 <el-option label="购买方" :value="3"></el-option>
               </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="代理起始时间:">
+              <el-date-picker
+                format="yyyy 年 MM 月 dd 日"
+                v-model="detailQuery.agengtStartDate"
+                type="date"
+                style="width: 80%"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="代理截止时间:">
+              <el-date-picker
+                format="yyyy 年 MM 月 dd 日"
+                v-model="detailQuery.agengtEndDate"
+                type="date"
+                style="width: 80%"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>

src/views/myLogin.vue

@@ -13,12 +13,11 @@
       label-position="left"
     >
       <el-card class="box-card">
-        <div style="text-align: center; margin-top: 10px">
-          <img alt="element-logo" src="@/assets/logo/logo.png" />
+        <div style="text-align: center; margin-top: 20px">
+          <img alt="element-logo" src="@/assets/logo/logo.png"/>
         </div>
-        <h3 class="title">用户注册</h3>
-        <el-form-item prop="mobile" class="item" style="margin-top: -20px">
-
+        <h3 class="title">企业注册</h3>
+        <el-form-item prop="mobile" class="item" style="margin-top: -10px">
           <el-input
             size="small"
             placeholder="请输入手机号"
@@ -65,7 +64,7 @@
             style="width: 60%; margin-bottom: 30px"
             :loading="loading"
             @click.native="handleLogin()"
-            >注册
+          >注册
           </el-button>
 
         </div>
@@ -91,8 +90,8 @@
 import Verify from "vue2-verify";
 import axios from "axios";
 import Cookies from "js-cookie";
-import { decrypt, encrypt } from "@/utils/jsencrypt";
-import {checkCode,getCheckcode,encrypts} from "@/api/login";
+import {decrypt, encrypt} from "@/utils/jsencrypt";
+import {checkCode, getCheckcode, encrypts} from "@/api/login";
 
 export default {
   data() {
@@ -106,20 +105,20 @@ export default {
       }
     };
     return {
-      yzm:"",
-      jmobile:"",
-      inputQuery :{
-        mobile : "",
-        checkCode : "",
+      yzm: "",
+      jmobile: "",
+      inputQuery: {
+        mobile: "",
+        checkCode: "",
       },
       rules: {
         tel: [
-          { required: true, message: "请输入联系电话", trigger: "blur" },
-          { validator: validatePhone, trigger: "blur" },
+          {required: true, message: "请输入联系电话", trigger: "blur"},
+          {validator: validatePhone, trigger: "blur"},
           // { pattern:/^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: "请输入正确的电话号码", trigger: "blur" }
         ],
         checkCode: [
-          { required: true, message: "请输入手机验证码", trigger: "blur" },
+          {required: true, message: "请输入手机验证码", trigger: "blur"},
         ],
       },
       isTimer: false,
@@ -128,28 +127,28 @@ export default {
   },
 
 
-    methods: {
-    handleLogin(){
-      checkCode(this.inputQuery).then( (res) => {
-        if(res.code == 20000 ){
+  methods: {
+    handleLogin() {
+      checkCode(this.inputQuery).then((res) => {
+        if (res.code == 20000) {
           //加密验证码
-           this.jmobile=res.data;
+          this.jmobile = res.data;
 
-          let param={
-            mobile:this.jmobile,
-            captcha:this.yzm,
-            key:"key",
+          let param = {
+            mobile: this.jmobile,
+            captcha: this.yzm,
+            key: "key",
           }
-          encrypts(param).then((res)=>{
-            if(res.code == 20000){
+          encrypts(param).then((res) => {
+            if (res.code == 20000) {
               //跳转到完善信息页面
-              this.$router.push({path: "/improveInfo",query:{mobile:res.data.mobile,captcha:res.data.captcha}});
+              this.$router.push({path: "/improveInfo", query: {mobile: res.data.mobile, captcha: res.data.captcha}});
 
-            }else{
+            } else {
               this.$message.error(res.message)
             }
           })
-        }else{
+        } else {
           this.$message.error(res.message);
         }
       })
@@ -163,7 +162,7 @@ export default {
       };
       getCheckcode(tquery).then((response) => {
         if (response.code === 20000) {
-          this.yzm=response.data;
+          this.yzm = response.data;
           this.validateBtn();
         } else {
           this.$message.error(response.message);
@@ -188,9 +187,6 @@ export default {
     },
 
 
-
-
-
   },
   components: {
     Verify,
@@ -274,6 +270,7 @@ $light_gray: #eee;
     font-weight: bold;
     margin-bottom: 50px;
   }
+
   .textTitle {
     width: 50%;
     font-size: 45px;
@@ -285,6 +282,7 @@ $light_gray: #eee;
     margin-top: 132px;
     margin-bottom: -10px;
   }
+
   .topSubtitle {
     color: #fcd38b;
     text-align: center;