From c46a1c7e26312a983d45037009d09cb7f165b3d6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 17:20:18 +0800
Subject: [PATCH 1/4] 28983 28984

---
 .../xiushan/apps/AppGroupShareholders/components/Add.vue   | 6 +++---
 project/xiushan/apps/AppHouseManagement/components/Add.vue | 5 ++---
 project/xiushan/apps/AppLandTransfer/components/Add.vue    | 7 ++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
index b812b4e3..5a48897d 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/Add.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
@@ -27,7 +27,7 @@
                 </el-col>
               </el-row>
               <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance"  @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+                <ai-area-select clearable always-show :instance="instance"  @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="12">
@@ -180,8 +180,8 @@ export default {
                       {min: 18, message: '请输入18位统一社会信用代码', trigger: 'blur'}],
         areaId: [
           {required: true, message: '请选择所在地区', trigger: 'blur'},
-          {pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
-          ],
+          {pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村',trigger: 'blur'}
+        ],
         stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}],
         fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
       }
diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index fc2c96f2..4554df8a 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
               </el-form-item>
               <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+                <ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="20">
@@ -135,9 +135,8 @@ export default {
       return {
         useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
         areaId: [
-          // {required: true, message: '所在地区必须选择到村', trigger: 'blur'}
           {required: true, message: '请选择所在地区', trigger: 'blur'},
-          {pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
+          {pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村',trigger: 'blur'}
         ],
         usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
         houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'},
diff --git a/project/xiushan/apps/AppLandTransfer/components/Add.vue b/project/xiushan/apps/AppLandTransfer/components/Add.vue
index 01e71b71..b59b9ee9 100644
--- a/project/xiushan/apps/AppLandTransfer/components/Add.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/Add.vue
@@ -55,7 +55,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="20">
-                  <el-form-item label="每亩年租金" prop="yearRent">
+                  <el-form-item label="每亩年租金(元)" prop="yearRent">
                     <el-input v-model="form.yearRent" placeholder="请输入"></el-input>
                   </el-form-item>
                 </el-col>
@@ -106,10 +106,11 @@
               <ai-info-item label="土地流出方" :value="data.landOutflowName" ></ai-info-item>
               <ai-info-item label="土地流出方证件号码" :value="data.landOutflowNumber"></ai-info-item>
               <ai-info-item label="土地承接方" :value="data.landUndertakeName"></ai-info-item>
-              <ai-info-item label="土地承接方证件号码" :value="data.landUndertakeNumber"></ai-info-item>
+              <ai-info-item label="土地承接方证件号码" :value="data.contractNo"></ai-info-item>
+              <ai-info-item label="合同编号" :value="data.landUndertakeNumber"></ai-info-item>
               <ai-info-item label="流转形式">{{ $dict.getLabel('landCirculateType',data.circulateType) }}</ai-info-item>
               <ai-info-item label="土地面积" :value="data.landArea"></ai-info-item>
-              <ai-info-item label="每亩年租金" :value="data.yearRent"></ai-info-item>
+              <ai-info-item label="每亩年租金(元)" :value="data.yearRent"></ai-info-item>
               <ai-info-item label="开始日期" :value="data.startDate"></ai-info-item>
               <ai-info-item label="截止日期" :value="data.endDate"></ai-info-item>
               <ai-info-item label="土地信息" :value="data.landInfo"></ai-info-item>

From 38de1f36f2da066c5d3e510887ea9242eadefa0d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 8 Apr 2022 17:25:04 +0800
Subject: [PATCH 2/4] bug

---
 .../bigscreen/designer/components/Add.vue     | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index 10c96920..81302c44 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -33,13 +33,14 @@
           </template>
           <template #content>
             <ai-table
-                :tableData="tableData"
-                :col-configs="colConfigs"
-                :total="total"
-                style="margin-top: 6px;"
-                :border="true"
-                :isShowPagination="false"
-                @getList="() => {}">
+              :tableData="tableData"
+              :col-configs="colConfigs"
+              :total="total"
+              style="margin-top: 6px;"
+              :border="true"
+              row-key="id"
+              :isShowPagination="false"
+              @getList="() => {}">
               <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
                 <template slot-scope="{ row, column, $index }">
                   <div class="table-options">
@@ -89,6 +90,7 @@
 <script>
 import AppGigscreenViewer from '../../viewer/AppGigscreenViewer'
 import Layout from './Layout.vue'
+import Sortable from 'sortablejs'
 
 export default {
   name: 'Add',
@@ -147,6 +149,10 @@ export default {
     }
   },
 
+  mounted () {
+    
+  },
+
   methods: {
     getInfo(id) {
       this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenProjectDetailById?id=${id}`).then(res => {
@@ -167,29 +173,29 @@ export default {
               }
             })
             this.total = res.data.lsList.length
+
+            this.$nextTick(() => {
+              this.rowDrop()
+            })
           }
         }
       })
     },
+    rowDrop() {
+      const tbody = document.querySelector('.el-table__body-wrapper tbody')
+      const _this = this
+      Sortable.create(tbody, {
+        onEnd({ newIndex, oldIndex }) {
+          const currRow = _this.tableData.splice(oldIndex, 1)[0]
+          _this.tableData.splice(newIndex, 0, currRow)
+        }
+      })
+    },
 
     toViewer(id) {
       this.screenId = id
     },
 
-    getList() {
-      this.instance.post(`${this.urlPrefix}/appdiylargescreen/allLargeScreenByPage`, null, {
-        params: {
-          current: 1,
-          size: 1000
-        }
-      }).then(res => {
-        if (res.code == 0) {
-          this.tableData = res.data.records
-          this.total = res.data.total
-        }
-      })
-    },
-
     onChange(e) {
       const ids = this.tableData.map(v => v.id)
       if (ids.indexOf(e.id) < 0) {
@@ -245,7 +251,7 @@ export default {
             if (res.code == 0) {
               this.$message.success('提交成功')
 
-              this.home?.refreshDvOptions()
+              this.home && this.home.refreshDvOptions && this.home.refreshDvOptions()
               setTimeout(() => {
                 this.cancel(true)
               }, 600)

From a0c42b0053a23611ac4d90d34d49a67f9ad835ab Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 17:26:50 +0800
Subject: [PATCH 3/4] 28985

---
 project/xiushan/apps/AppLandTransfer/components/Add.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/xiushan/apps/AppLandTransfer/components/Add.vue b/project/xiushan/apps/AppLandTransfer/components/Add.vue
index b59b9ee9..f85064e5 100644
--- a/project/xiushan/apps/AppLandTransfer/components/Add.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/Add.vue
@@ -109,12 +109,12 @@
               <ai-info-item label="土地承接方证件号码" :value="data.contractNo"></ai-info-item>
               <ai-info-item label="合同编号" :value="data.landUndertakeNumber"></ai-info-item>
               <ai-info-item label="流转形式">{{ $dict.getLabel('landCirculateType',data.circulateType) }}</ai-info-item>
-              <ai-info-item label="土地面积" :value="data.landArea"></ai-info-item>
+              <ai-info-item label="土地面积/㎡" :value="data.landArea"></ai-info-item>
               <ai-info-item label="每亩年租金(元)" :value="data.yearRent"></ai-info-item>
               <ai-info-item label="开始日期" :value="data.startDate"></ai-info-item>
               <ai-info-item label="截止日期" :value="data.endDate"></ai-info-item>
-              <ai-info-item label="土地信息" :value="data.landInfo"></ai-info-item>
-              <ai-info-item label="土地用途" :value="data.landUse"></ai-info-item>
+              <ai-info-item label="土地信息" :value="data.landInfo" isLine></ai-info-item>
+              <ai-info-item label="土地用途" :value="data.landUse" isLine></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>

From ecb6a02a46f116ca80fd459a93e5bf8f7a783c9d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 17:43:02 +0800
Subject: [PATCH 4/4] 28948

---
 .../xiushan/apps/AppHouseManagement/components/Add.vue | 10 +++++++++-
 .../xiushan/apps/AppLandTransfer/components/List.vue   |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index 4554df8a..61077a8d 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -140,7 +140,7 @@ export default {
         ],
         usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
         houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'},
-                      {pattern: /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/, message: '请输入正整数',trigger: 'blur'}],
+                      {pattern: /^[1-9]\d*$/, message: '请输入正整数',trigger: 'blur'}],
         idNumber: [{required: true, message: '请输入身份证号', trigger: 'blur'}],
         landOwnership: [{required: true, message: '请输入土地所有权', trigger: 'blur'}],
         landArea: [{required: true, message: '请输入土地面积', trigger: 'blur'}],
@@ -201,5 +201,13 @@ export default {
   ::v-deep .ai-detail .ai-detail__footer {
     background: #FFF;
   }
+
+  ::v-deep input::-webkit-outer-spin-button,
+  ::v-deep input::-webkit-inner-spin-button {
+    -webkit-appearance: none !important;
+  }
+  ::v-deep input[type='number'] {
+    -moz-appearance: textfield !important;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppLandTransfer/components/List.vue b/project/xiushan/apps/AppLandTransfer/components/List.vue
index 4649bd86..89b5351d 100644
--- a/project/xiushan/apps/AppLandTransfer/components/List.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/List.vue
@@ -6,7 +6,7 @@
         <ai-search-bar>
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
-            <ai-select v-model="circulateType" @change="onChange" placeholder="流转形式" :selectList="$dict.getDict('landCirculateType')"></ai-select>
+            <ai-select v-model="select.circulateType" @change="onChange" placeholder="流转形式" :selectList="$dict.getDict('landCirculateType')"></ai-select>
           </template>
           <template #right>
             <el-input size="small" placeholder="查询合同编号/流出方/承接方/证件号码" v-model="search.contractNo" clearable @clear="page.current = 1, search.contractNo = '',getTableData()"