Merge branch '165' of uskycloud/usky-web-mobile into master

src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -88,10 +88,10 @@
             </view>
             <view style="padding-left: 9px">
               <u-form-item label="建筑名称" :prop="`baseBuildList.${index}.baseBuild.buildName`" required :borderBottom="true">
-                <u-input v-model="li.baseBuild.buildName" placeholder="请输入建筑名称" border="none" />
+                <u-input v-model="li.baseBuild.buildName" placeholder="请输入建筑名称" border="none" maxlength="30" />
               </u-form-item>
               <u-form-item label="建筑地址" :prop="`baseBuildList.${index}.baseBuild.address`" required :borderBottom="true">
-                <u-input v-model="li.baseBuild.address" placeholder="请输入建筑地址" border="none" />
+                <u-input v-model="li.baseBuild.address" placeholder="请输入建筑地址" border="none" maxlength="100" />
               </u-form-item>
               <u-form-item label="建筑结构" :prop="`baseBuildList.${index}.baseBuild.buildStructure`" required :borderBottom="true" @click="handleAction('建筑结构', index)">
                 <u-input
@@ -113,22 +113,38 @@
               </u-form-item>
 
               <u-form-item label="建筑高度" :prop="`baseBuildList.${index}.baseBuild.buildHigh`" required :borderBottom="true">
-                <u-input type="number" v-model="li.baseBuild.buildHigh" placeholder="请输入建筑高度" suffixIcon="米" suffixIconStyle="color: #909399;font-size:15px" border="none" />
+                <u-input type="number" v-model="li.baseBuild.buildHigh" placeholder="请输入建筑高度" suffixIcon="米" suffixIconStyle="color: #909399;font-size:15px" border="none" maxlength="20" />
               </u-form-item>
               <u-form-item label="地上层数" :prop="`baseBuildList.${index}.baseBuild.aboveFloor`" required :borderBottom="true">
-                <u-input type="number" v-model="li.baseBuild.aboveFloor" placeholder="请输入地上层数" border="none" />
+                <u-input type="number" v-model="li.baseBuild.aboveFloor" placeholder="请输入地上层数" border="none" maxlength="5" />
               </u-form-item>
               <u-form-item label="地下层数" prop="li.underFloor" :borderBottom="true">
-                <u-input type="number" v-model="li.baseBuild.underFloor" placeholder="请输入地下层数" border="none" />
+                <u-input type="number" v-model="li.baseBuild.underFloor" placeholder="请输入地下层数" border="none" maxlength="5" />
               </u-form-item>
               <u-form-item label="建筑面积" :prop="`baseBuildList.${index}.baseBuild.buildArea`" required :borderBottom="true">
-                <u-input type="digit" v-model="li.baseBuild.buildArea" placeholder="请输入建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+                <u-input type="digit" v-model="li.baseBuild.buildArea" placeholder="请输入建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" maxlength="20" />
               </u-form-item>
               <u-form-item label="地下空间" prop="li.underSpace" :borderBottom="true">
-                <u-input type="number" v-model="li.baseBuild.underSpace" placeholder="请输入地下空间面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+                <u-input
+                  type="number"
+                  v-model="li.baseBuild.underSpace"
+                  placeholder="请输入地下空间面积"
+                  suffixIcon="平方米"
+                  suffixIconStyle="color:#999999;font-size:15px"
+                  border="none"
+                  maxlength="20"
+                />
               </u-form-item>
               <u-form-item label="建成年份" :prop="`baseBuildList.${index}.baseBuild.completeYear`" required :borderBottom="true" @click="handleDateTime('建成年份', index, li.completeYear)">
-                <u-input v-model="li.baseBuild.completeYear" placeholder="请选择建成年份" suffixIcon="calendar" suffixIconStyle="color: #909399;font-size:22px" border="none" />
+                <u-input
+                  v-model="li.baseBuild.completeYear"
+                  placeholder="请选择建成年份"
+                  suffixIcon="calendar"
+                  suffixIconStyle="color: #909399;font-size:22px"
+                  border="none"
+                  disabledColor="transparent"
+                  disabled
+                />
               </u-form-item>
               <u-form-item label="使用性质" :prop="`baseBuildList.${index}.baseBuild.useCharacter`" required :borderBottom="true" @click="handleAction('使用性质', index)">
                 <u-input
@@ -145,29 +161,29 @@
               <view v-if="li.baseBuild.useCharacter == '厂房' || li.baseBuild.useCharacter == '仓库'">
                 <view style="margin: 10px 0; text-align: center">危险品生产数量（吨/月）</view>
                 <u-form-item label="甲类" prop="li.baseBuildAttach.hazardousProduceA" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceA" placeholder="请输入甲类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceA" placeholder="请输入甲类" border="none" maxlength="24" />
                 </u-form-item>
                 <u-form-item label="乙类" prop="li.baseBuildAttach.hazardousProduceB" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceB" placeholder="请输入乙类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceB" placeholder="请输入乙类" border="none" maxlength="24" />
                 </u-form-item>
                 <u-form-item label="丙类" prop="li.baseBuildAttach.hazardousProduceC" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceC" placeholder="请输入丙类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceC" placeholder="请输入丙类" border="none" maxlength="24" />
                 </u-form-item>
                 <u-form-item label="丁戊类" prop="li.baseBuildAttach.hazardousProduceD" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceD" placeholder="请输入丁戊类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceD" placeholder="请输入丁戊类" border="none" maxlength="24" />
                 </u-form-item>
                 <view style="margin: 10px 0; text-align: center">危险品存储数量（吨）</view>
                 <u-form-item label="甲类" prop="li.baseBuildAttach.hazardousStorageA" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageA" placeholder="请输入甲类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageA" placeholder="请输入甲类" border="none" maxlength="24" />
                 </u-form-item>
                 <u-form-item label="乙类" prop="li.baseBuildAttach.hazardousStorageB" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageB" placeholder="请输入乙类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageB" placeholder="请输入乙类" border="none" maxlength="24" />
                 </u-form-item>
                 <u-form-item label="丙类" prop="li.baseBuildAttach.hazardousStorageC" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageC" placeholder="请输入丙类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageC" placeholder="请输入丙类" border="none" maxlength="24" />
                 </u-form-item>
                 <u-form-item label="丁戊类" prop="li.baseBuildAttach.hazardousStorageD" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageD" placeholder="请输入丁戊类" border="none" />
+                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageD" placeholder="请输入丁戊类" border="none" maxlength="24" />
                 </u-form-item>
               </view>
 
@@ -187,8 +203,8 @@
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="气体灭火系统" :name="4"> </u-checkbox>
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="干粉灭火系统" :name="5"> </u-checkbox>
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="其他" :name="6"> </u-checkbox>
+                  <u-input v-if="li.baseBuild.otherSystem.includes(6)" v-model="li.baseBuild.otherFacilities" placeholder="请输入消防设施名称" border="none" />
                 </u-checkbox-group>
-                <u-input v-model="li.baseBuild.otherFacilities" placeholder="请输入消防设施名称" border="none" />
               </u-form-item>
 
               <view>
@@ -202,7 +218,7 @@
                     <u-input v-model="base.extinguishType" placeholder="请选择类型" border="none" suffixIcon="arrow-right" suffixIconStyle="color: #909399" disabledColor="transparent" disabled />
                   </u-form-item>
                   <u-form-item label="数量" :prop="`baseBuildList.${index}.baseBuildExtinguishList.${ind}.extinguishNum`" :borderBottom="true" required>
-                    <u-input type="number" v-model="base.extinguishNum" placeholder="请输入数量" border="none" />
+                    <u-input type="number" v-model="base.extinguishNum" placeholder="请输入数量" border="none" maxlength="10" />
                   </u-form-item>
                 </view>
                 <u-button
@@ -534,7 +550,7 @@ const dataList = reactive({
     companyName: [
       {
         required: true,
-        message: "请输入单位名称",
+        message: "请输入营业执照单位名称",
         trigger: ["blur", "change"],
       },
     ],
@@ -821,6 +837,7 @@ const uForm = ref(null);
 const uForm1 = ref(null);
 const newCompanyName = ref("");
 const successBool = ref(false);
+const scanBool = ref(false);
 
 /**
  * @单位名称
@@ -879,8 +896,6 @@ function handleSubmit(value) {
  * @api提交
  */
 function handleSubmitApi(value) {
-  console.log(form.value);
-
   let param = {};
 
   uForm1.value
@@ -975,19 +990,17 @@ function handleSubmitApi(value) {
         }
       });
 
-      console.log(param);
-
       addBaseCompany(param).then((res) => {
         if (res.status == "SUCCESS") {
-          if (getToken()) {
+          if (scanBool) {
+            successBool.value = true;
+          } else {
             uni.showToast({
               title: "提交成功",
             });
             setTimeout(() => {
               proxy.$tab.reLaunch("/pages/index");
             }, 2000);
-          } else {
-            successBool.value = true;
           }
         }
       });
@@ -1284,8 +1297,6 @@ function handleAction(value, index, ind) {
  */
 function selectAction(e) {
   if (actionTitle.value == "单位名称") {
-    console.log(e.value[0]);
-
     form.value.baseBuildList = [];
     rules.value.baseBuildList = [];
 
@@ -1438,8 +1449,8 @@ function addSubmit(type, index) {
  */
 function deleteSubmit(type, event, even) {
   if (type == "建筑") {
-    if ("id" in event) {
-      delBaseBuild(event.id).then((res) => {
+    if ("id" in event.baseBuild) {
+      delBaseBuild(event.baseBuild.id).then((res) => {
         if (res.status == "SUCCESS") {
           form.value.baseBuildList.splice(form.value.baseBuildList.indexOf(event), 1);
         }
@@ -1467,7 +1478,11 @@ onLoad((options) => {
 
   addSubmit("建筑");
 
-  if (!getToken()) {
+  if (options.scanBool) {
+    scanBool.value = options.scanBool;
+  }
+
+  if (scanBool) {
     document.getElementsByClassName("uni-page-head-hd")[0].style.cssText = "display: none;";
   }
 });

src/uni_modules/uview-plus/components/u-picker/u-picker.vue

@@ -214,7 +214,7 @@ export default {
 		},
 		// 设置整体各列的columns的值
 		setColumns(columns) {
-			console.log(columns)
+			// console.log(columns)
 			this.innerColumns = uni.$u.deepClone(columns)
 			// 如果在设置各列数据时，没有被设置默认的各列索引defaultIndex，那么用0去填充它，数组长度为列的数量
 			if (this.innerIndex.length === 0) {