From 2206200f5c9913262e3cfd413033c3350d8cecb3 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 30 Jul 2024 18:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E6=89=A7=E6=B3=95=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=8A=9F=E8=83=BD=E4=B8=AD=EF=BC=8C=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E4=BB=85=E9=80=89=E6=8B=A9=E6=B3=95=E5=BE=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E7=BB=86=E8=8A=82=E6=9D=A1=E6=AC=BE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B9=8B=E7=B1=BB=E7=9A=84=EF=BC=8C=E5=90=8C=E6=97=B6=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E4=B8=80=E4=B8=AA=E5=8F=AF=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E5=AF=B9=E6=89=A7=E6=B3=95=E4=BE=9D=E6=8D=AE=E7=9A=84=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=EF=BC=88=E5=8F=AF=E8=A1=A5=E5=85=85=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/globalRouter.js          |   3 +-
 src/views/enforce/sign.vue          |  76 +++++++++---
 src/views/enforce/zqyjjdmFilter.vue |   2 +-
 src/views/login.vue                 | 179 ++++++++++++++--------------
 4 files changed, 155 insertions(+), 105 deletions(-)

diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js
index fe192c7..308fca6 100644
--- a/src/common/globalRouter.js
+++ b/src/common/globalRouter.js
@@ -4,7 +4,8 @@ let routes = [
 	{
 		path: "/",
 		// redirect: "/home",
-		redirect: "/enforceHome",
+		// redirect: "/enforceHome",
+		redirect: "/login",
 		name: "App",
 	},
 	{
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 7186496..9102c50 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -100,18 +100,28 @@
 <!--                      autosize-->
 <!--                    />-->
                     <van-field v-model="submitData.lawEnforcementItem" v-show="false" />
-                    <van-field
-                      v-model="data.lawEnforcementBasisText"
-                      required
-                      readonly
-                      :rules="[{ required: true, message: '必填项' }]"
-                      label="检查依据"
-                      placeholder="检查依据"
-                      @click="showPopupqz"
-                      type="textarea"
-                      rows="1"
-                      autosize
+<!--                    <van-field-->
+<!--                      v-model="data.lawEnforcementBasisText"-->
+<!--                      required-->
+<!--                      readonly-->
+<!--                      :rules="[{ required: true, message: '必填项' }]"-->
+<!--                      label="检查依据"-->
+<!--                      placeholder="检查依据"-->
+<!--                      @click="showPopupqz"-->
+<!--                      type="textarea"-->
+<!--                      rows="1"-->
+<!--                      autosize-->
+<!--                    />-->
+                    <van-field v-for="(item, index) in data.lawList" :key="index"
+                               v-model="item.text"
+                               readonly
+                               label="检查依据"
+                               placeholder="检查依据"
+                               @click="showPopupqz(index)"
+                               rows="1"
+                               autosize
                     />
+                    <van-button icon="add-o" block="true" square="true" type="default" @click.stop="addField" />
                     <van-field v-model="submitData.lawEnforcementBasis" v-show="false" />
 <!--                    <van-field-->
 <!--                      v-model="submitData.reslut"-->
@@ -251,6 +261,8 @@ const data = reactive({
     isNoScan: false,
     lawChecked: false,
     lawContent: "",
+    lawList: [{text:"", id:""}],
+    lawCliekFlag: 0,
 });
 var fileSize = 0;
 //保存参数
@@ -278,6 +290,7 @@ const submitData = reactive({
     lawEnforcementItemText:"",
     //执法依据
     lawEnforcementBasis:"",
+    lawEnforcementBasisText:"",
     //执法结果
     reslut:0,
     //备注
@@ -451,6 +464,7 @@ const gaCancel = () => {
 const dataFillIn = () => {
     // getRegByUserIdAndZero(useCommon.userId,success =>{
     getByUserIdAndEnterpriseNumber(useCommon.userId, submitData.enterpriseNumber,success =>{
+        console.log("========> : ", success);
         //跳转企业二维码地址
         if(success.success){
             Object.keys(submitData).forEach((item) => {
@@ -463,6 +477,16 @@ const dataFillIn = () => {
             // submitData.lawCertificateNumText =success.data['lawEnforcer'];
             submitData.lawCertificateNumTwoText =success.data['lawEnforcerTwo'];
             submitData.subsidiaryerText =success.data['subsidiaryer'];
+            submitData.lawEnforcementBasis = success.data['lawEnforcementBasis'];
+            submitData.lawEnforcementBasisText = success.data['lawEnforcementBasisText'];
+            var tmpBasis = submitData.lawEnforcementBasis.split(',');
+            var tmpBasisText = submitData.lawEnforcementBasisText.split(',');
+            data.lawList = [];
+            for (var i=0; i<tmpBasis.length; i++) {
+                data.lawList.push({
+                    index: i, text:tmpBasisText[i], id:tmpBasis[i]
+                });
+            }
             if(success.data['reslut']==0) {
                 tapGood();
             } else {
@@ -470,7 +494,6 @@ const dataFillIn = () => {
             }
             submitData.fileList = [];
             submitData.fileListObj = [];
-            showSuccessToast('保存成功');
         }
     },error=>{
         console.log("保存失败")
@@ -480,6 +503,14 @@ const dataFillIn = () => {
 const tmpSave = () => {
     showSuccessToast('临时保存');
     submitData.userId = useCommon.userId;
+    submitData.lawEnforcementBasis = "";
+    submitData.lawEnforcementBasisText = "";
+    for (var i=0; i<data.lawList.length; i++) {
+        submitData.lawEnforcementBasis += data.lawList[i].id +",";
+        submitData.lawEnforcementBasisText += data.lawList[i].text +",";
+    }
+    submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1);
+    submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
     addEnforcementRegistration(submitData,success =>{
         //跳转企业二维码地址
         if(success.success){
@@ -494,6 +525,14 @@ const tmpSave = () => {
 const submit = (type) =>{
     submitData.isSubmit = type;
     submitData.userId = useCommon.userId;
+    submitData.lawEnforcementBasis = "";
+    submitData.lawEnforcementBasisText = "";
+    for (var i=0; i<data.lawList.length; i++) {
+        submitData.lawEnforcementBasis += data.lawList[i].id +",";
+        submitData.lawEnforcementBasisText += data.lawList[i].text +",";
+    }
+    submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1);
+    submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
     form.value.validate().then(() => {
         editEnforcementRegistration(submitData, success => {
             //跳转首页
@@ -513,9 +552,13 @@ const showPopup = () =>{
 const showPopup2 = () =>{
     data.popupVisible2 = true;
 }
-const showPopupqz = () =>{
+const showPopupqz = (flag) =>{
+    data.lawCliekFlag = flag;
     data.popupVisibleqz = true;
 }
+const addField = () =>{
+    data.lawList.push({ text:"", id:"" });
+}
 const closePopup = () =>{
     data.popupVisible = false;
     data.popupVisible2 = false;
@@ -535,10 +578,11 @@ const reciveData2 = (item) =>{
     submitData.subsidiaryerText = item.userName;
 }
 const reciveDataqz = (item) =>{
-    console.log(item);
-    submitData.lawEnforcementBasis = item.id;
+    data.lawList[data.lawCliekFlag].id = item.id;
+    data.lawList[data.lawCliekFlag].text = item.lawName;
+    // submitData.lawEnforcementBasis = item.id;
     // submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum;
-    data.lawEnforcementBasisText = item.lawName;
+    // data.lawEnforcementBasisText = item.lawName;
 }
 const reciveLaw = (item) => {
     submitData.lawId = item.id;
diff --git a/src/views/enforce/zqyjjdmFilter.vue b/src/views/enforce/zqyjjdmFilter.vue
index 62bc5c1..cf181ff 100644
--- a/src/views/enforce/zqyjjdmFilter.vue
+++ b/src/views/enforce/zqyjjdmFilter.vue
@@ -18,7 +18,7 @@
         <div class="search-result">
           <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
             <div class="case-title">法律名称：{{ item.lawName }}</div>
-              <div class="case-time">内容：{{ item.content }}</div>
+<!--              <div class="case-time">内容：{{ item.content }}</div>-->
           </div>
     </div>
     </div>
diff --git a/src/views/login.vue b/src/views/login.vue
index 76dcb3a..c69ab2c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,67 +1,70 @@
 <template>
-	<div class="login-page">
-		<div class="login-content">
-			<van-nav-bar >
-				<template #title>
-					<div class="title">
-						登录
-					</div>
-				</template>
-			</van-nav-bar>
-			<van-form @submit="onSubmit">
-				<van-field v-model="loginParam.secretName" name="secretName"  label="用户名" placeholder="用户名"
-					:rules="[{ required: true, message: '请填写用户名' }]" />
-				<van-field v-model="loginParam.secretKey" type="password" name="secretKey" label="密码" placeholder="密码"
-					:rules="[{ required: true, message: '请填写密码' }]" />
-				<div style="margin: 0.42rem">
-					<van-button block type="primary" native-type="submit">登录</van-button>
-				</div>
-			</van-form>
-			<router-link to="/register" class="link">还没有账号,去注册</router-link>
-		</div>
-	</div>
+    <div class="login-page">
+        <div class="login-content">
+            <van-nav-bar>
+                <template #title>
+                    <div class="title">
+                        登录
+                    </div>
+                </template>
+            </van-nav-bar>
+            <van-form @submit="onSubmit">
+                <van-field v-model="loginParam.secretName" name="secretName" label="用户名" placeholder="用户名"
+                           :rules="[{ required: true, message: '请填写用户名' }]"/>
+                <van-field v-model="loginParam.secretKey" type="password" name="secretKey" label="密码" placeholder="密码"
+                           :rules="[{ required: true, message: '请填写密码' }]"/>
+                <div style="margin: 0.42rem">
+                    <van-button block type="primary" native-type="submit">登录</van-button>
+                </div>
+            </van-form>
+            <router-link to="/register" class="link">还没有账号,去注册</router-link>
+        </div>
+    </div>
 </template>
 <script setup>
-import { reactive } from 'vue';
-import {userLogin, testLogin} from '../api/Home';
-import CryptoJS from "crypto-js";
-const { useCommon } = $globalStore;
-const router = useRouter();
-const loginParam = reactive({
-  secretName:"",
-  secretKey:""
-})
-const userLoginParam = {};
-userLoginParam.username = loginParam.username;
-userLoginParam.password = loginParam.password;
-const onSubmit = async (values) => {
-  console.log(values);
-	// await getGoodsnum();
-	// await getLang();
-  // values.secretName = values.name;
-  values.secretKey = Encrypt(values.secretKey);
-  // return;
-  // userLogin(values,success=>{
-  testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey},success=>{
-    console.log(success);
-        // router.push({ name: "Home" });
-        router.push({ name: "enforceHome" });
-        //设置全局变量
-        useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
-        useCommon.SET_USER_ID(success.data.userId);
-        useCommon.SET_TOKEN(success.data.token);
-        // 监听uni-app发送的消息
-        window.addEventListener('message', (event) => {
-          console.log('Received message from uni-app:', event.data);
-          // 向uni-app返回消息
-          window.parent.postMessage('Hello, uni-app!', '*');
-        });
-      },error=>{
-          console.log("登录失败")
-      })
-};
+    import {reactive} from 'vue';
+    import {userLogin, testLogin} from '../api/Home';
+    import CryptoJS from "crypto-js";
+
+    const {useCommon} = $globalStore;
+    const router = useRouter();
+    const loginParam = reactive({
+        secretName: "",
+        secretKey: ""
+    })
+    const userLoginParam = {};
+    userLoginParam.username = loginParam.username;
+    userLoginParam.password = loginParam.password;
+    const onSubmit = async (values) => {
+        // await getGoodsnum();
+        // await getLang();
+        // values.secretName = values.name;
+        values.secretKey = Encrypt(values.secretKey);
+        // return;
+        // userLogin(values,success=>{
+        testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, success => {
+            if (success.success) {
+                // router.push({ name: "Home" });
+                router.push({name: "enforceHome"});
+                //设置全局变量
+                useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
+                useCommon.SET_USER_ID(success.data.userId);
+                useCommon.SET_TOKEN(success.data.token);
+                // 监听uni-app发送的消息
+                window.addEventListener('message', (event) => {
+                    console.log('Received message from uni-app:', event.data);
+                    // 向uni-app返回消息
+                    window.parent.postMessage('Hello, uni-app!', '*');
+                });
+            } else {
+                console.log("登录失败")
+            }
+        }, error => {
+            console.log("登录失败")
+        })
+    };
 
-const Encrypt = (passWord) =>{
+    const Encrypt = (passWord) => {
         var keyStr = '1234567898745621';
         var ivStr = keyStr;
         var key = CryptoJS.enc.Utf8.parse(keyStr);
@@ -77,33 +80,35 @@ const Encrypt = (passWord) =>{
 </script>
 
 <style lang="less" scoped>
-.login-page {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	overflow: hidden;
-	background-image: url("~@/assets/images/login.jpg");
-	background-repeat: no-repeat;
-	background-size: cover;
-	opacity: 0.9;
-	.login-content {
-		margin: auto;
-		padding: 0.27rem 0.27rem 0.52rem 0.27rem;
-		background-color: #fff;
-		border-radius: 0.27rem;
-		box-shadow: 0 0 0.27rem rgba(0, 0, 0, 0.2);
-		opacity: 0.9;
-		.title{
-            font-size: 0.52rem;
-            font-weight: 600;
+    .login-page {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        overflow: hidden;
+        background-image: url("~@/assets/images/login.jpg");
+        background-repeat: no-repeat;
+        background-size: cover;
+        opacity: 0.9;
+
+        .login-content {
+            margin: auto;
+            padding: 0.27rem 0.27rem 0.52rem 0.27rem;
+            background-color: #fff;
+            border-radius: 0.27rem;
+            box-shadow: 0 0 0.27rem rgba(0, 0, 0, 0.2);
+            opacity: 0.9;
+
+            .title {
+                font-size: 0.52rem;
+                font-weight: 600;
+            }
         }
-	}
 
-	.link {
-		font-size: 0.32rem;
-		color: #069;
-		float: right;
-		margin-right: 0.4rem;
-	}
-}
+        .link {
+            font-size: 0.32rem;
+            color: #069;
+            float: right;
+            margin-right: 0.4rem;
+        }
+    }
 </style>