Merge remote-tracking branch 'origin/dev' into dev

packages/bigscreen/designer/components/Add.vue

@@ -38,6 +38,7 @@
               :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">
@@ -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)

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,7 +180,7 @@ 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'}],

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,13 +135,12 @@ 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'},
-                      {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'}],
@@ -202,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>

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,14 +106,15 @@
               <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.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>
+              <ai-info-item label="土地信息" :value="data.landInfo" isLine></ai-info-item>
-              <ai-info-item label="土地用途" :value="data.landUse"></ai-info-item>
+              <ai-info-item label="土地用途" :value="data.landUse" isLine></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>

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()"