Merge branch 'master' of http://111.203.232.171:8888/fubaole/national_museum_vod-h5

src/views/setTopBoxManage/components/form.vue

@@ -5,13 +5,16 @@
         class="field-form-item"
         readonly
         clickable
+        required
         name="organName"
         :value="boxInfo.organName"
         label="机顶盒所属单位"
         placeholder="请选择组织单位"
         :right-icon="showOrg ? 'arrow-up' : 'arrow-down'"
         @click="showOrg = true"
-        :rules="[{ required: true }]"
+        :rules="[
+          { required: true, message: '请选择组织单位', trigger: 'change'}
+        ]"
       />
       <van-popup v-model="showOrg" position="bottom">
         <van-picker
@@ -24,10 +27,14 @@
       <van-field
         class="field-form-item"
         v-model="boxInfo.macURL"
+        required
         name="macURL"
         label="机顶盒Mac地址"
         placeholder="请填写机顶盒Mac地址"
-        :rules="[{ required: true }]"
+        :rules="[
+          { required: true, message: '请填写机顶盒Mac地址', trigger: ['blur', 'change'] },
+          { pattern: /^[A-F0-9]{2}([-:]?[A-F0-9]{2})([-:.]?[A-F0-9]{2})([-:]?[A-F0-9]{2})([-:.]?[A-F0-9]{2})([-:]?[A-F0-9]{2})$/, message: '请填写正确的Mac地址', trigger: ['blur', 'change']}
+        ]"
       />
       <div class="form-page-button">
         <van-button type="default" native-type="submit" v-if="actived === '1'"
@@ -52,7 +59,6 @@ export default {
       showUser: false,
     };
   },
-  watch: {},
   mounted() {
     this.getorganName();
   },
@@ -67,8 +73,13 @@ export default {
       })
         .then((res) => {
           if (res.data.resultCode === "200") {
-            vm.orgList = res.data.data;
-            vm.orgNameList = res.data.data.map((item) => item.organName);
+            if(this.actived==='1'){
+              this.orgList = res.data.data.filter(item=>item.status !==2)
+            }
+            if(this.actived==='2'){
+              this.orgList = res.data.data.filter(item=>item.status===2)
+            }
+            vm.orgNameList = this.orgList.map((item) => item.organName);
           }
         })
         .catch(function (err) {
@@ -138,6 +149,10 @@ export default {
         margin-right: 12px;
       }
     }
+    .van-cell--required::before {
+      left: -10px;
+      color:#A4151D;
+    }
   }
   .form-page-button {
     text-align: center;
@@ -181,7 +196,6 @@ export default {
       font-weight: normal;
     }
   }
-
   .van-tabs__nav--card {
     margin: 0;
   }

src/views/setTopBoxManage/opt.vue

@@ -3,7 +3,7 @@
     <div class="opt-page">
       <van-tabs type="card" v-model="activeName">
         <van-tab title="机顶盒激活" name="1">
-          <custom-form actived="1"></custom-form>
+          <custom-form  actived="1"></custom-form>
         </van-tab>
         <van-tab title="故障上报" name="2">
           <custom-form actived="2"></custom-form>