Hwt 2 سال پیش
والد
کامیت
2cb68812cf

+ 4 - 4
operationSupport/src/views/patrolManagement/patrolStandard.vue

@@ -165,14 +165,14 @@ export default {
         new Promise((resolve) => {
           this.$store.dispatch('addPopup', {
             url: '/patrolManagement/popups/patrolAdd.vue',
-            width: '850px',
-            height: '581px',
+            width: '580px',
+            height: '480px',
             props: {
               // id: row.id,
               callback: resolve
             },
-            showConfirmButton: true,
-            showCancelButton: true,
+            // showConfirmButton: true,
+            // showCancelButton: true,
             // hideStar: true,
             title: '添加巡更类型'
           });

+ 209 - 24
operationSupport/src/views/patrolManagement/popups/patrolAdd.vue

@@ -9,30 +9,127 @@
     >
 
       <div class="formContent-item_title">巡更类型定义</div>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item
-            label="所属社区"
-            prop="communityId"
-            class="show-required-icon-star"
-          >
-
-            <el-select
-              v-model="formData.communityId"
-              placeholder="请选择社区"
+      <template>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item
+              label="所属社区"
+              prop="communityId"
+              class="show-required-icon-star"
             >
-              <el-option
-                v-for="(item,index) in communityList"
-                :value="itme.value"
-                :label="item.label"
-                :key="index"
+
+              <el-select
+                v-model="formData.communityId"
+                placeholder="请选择社区"
+              >
+                <el-option
+                  v-for="(item,index) in communityList"
+                  :value="item.value"
+                  :label="item.label"
+                  :key="index"
+                >
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item
+              label="巡更类型"
+              prop="patrolType"
+              class="show-required-icon-star"
+            >
+              <el-select
+                v-model="formData.patrolType"
+                placeholder="请选择巡更类型"
+              >
+                <el-option
+                  v-for="(item,index) in patrolTypeList"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+          </el-col>
+        </el-row>
+      </template>
+
+      <div class="formContent-item_title">巡更内容定义</div>
+      <!-- <template slot-scope="scope"> -->
+      <div class="scrollBar">
+        <el-row
+          v-for="(items,indexs) in formData.contentDtoList"
+          :key="indexs"
+        >
+          <el-col :span="12">
+            <el-form-item
+              label="巡更内容"
+              :prop="'contentDtoList.'+indexs+'.content'"
+              :rules="rules.content"
+              class="show-required-icon-star"
+            >
+              <!-- :required="!item.content" -->
+              <el-input
+                v-model="formData.contentDtoList[indexs].content"
+                placeholder="请输入巡更内容"
+                clearable
+              ></el-input>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item
+              label="选项组成"
+              class="show-required-icon-star"
+              style="margin-right: 5px;"
+            >
+
+              <el-select
+                v-model="formData.contentDtoList[indexs].option"
+                placeholder="请选择"
               >
-              </el-option>
-            </el-select>
+                <el-option
+                  v-for="(itemd,inded) in optionComposition"
+                  :key="inded"
+                  :value="itemd.value"
+                  :label="itemd.label"
+                >
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-tooltip
+              effect="light"
+              placement="bottom"
+              content="添加"
+              style="margin-right: 10px; "
+              v-if="(formData.contentDtoList.length - 1) == indexs ? true : false"
+            >
+              <i
+                class="zoniot_font zoniot-icon-tianjia1"
+                @click="add"
+              ></i>
+            </el-tooltip>
+            <el-tooltip
+              effect="light"
+              placement="bottom"
+              content="删除"
+            >
+              <i
+                class="zoniot_font zoniot-icon-shanjian"
+                @click="deleteOne(indexs)"
+              ></i>
+            </el-tooltip>
+          </el-col>
+
+        </el-row>
+      </div>
 
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
   </div>
 </template>
@@ -44,14 +141,66 @@ export default {
     return {
       formData: {
         communityId: '',
+        patrolType: '',
+        contentDtoList: [
+          {
+            content: '',
+            option: ''
+          }
+        ]
       },
       communityList: [],
+      patrolTypeList: [
+        {
+          label: '市容市貌',
+          value: '1'
+        },
+        {
+          label: '环境卫生',
+          value: '2'
+        },
+        {
+          label: '公共秩序',
+          value: '3'
+        },
+        {
+          label: '设备实施',
+          value: '4'
+        },
+        {
+          label: '消防安全',
+          value: '5'
+        },
+
+      ],
+      optionComposition: [
+        {
+          label: '是、否',
+          value: '1'
+        },
+        {
+          label: '坏、好',
+          value: '2'
+        },
+        {
+          label: '有、无',
+          value: '3'
+        },
+        {
+          label: '差、好',
+          value: '4'
+        }
+      ],
+      rules: {
+        communityId: [{ required: true, message: '请输入所属社区', trigger: 'change' },],
+        patrolType: [{ required: true, message: '请输入巡更类型', trigger: 'change' },],
+        content: { required: true, message: '请输入巡更内容', trigger: 'blur' },
+      }
     }
   },
   methods: {
     getOrgTreeList () {
       this.$http.get('/czc-community/assets/community/list').then(({ status, data, msg }) => {
-        debugger
         if (status == 0) {
           this.communityList = [];
           data.map((item, index) => {
@@ -60,9 +209,33 @@ export default {
               value: item.id
             })
           });
-
         }
       })
+    },
+    submit () {
+      this.$refs.formData.validate((valid) => {
+        if (valid) {
+          this.$http.post('/czc-community/patrol/standard/add').then(({ status, data, msg }) => {
+            debugger
+          })
+        } else {
+          return;
+        }
+      })
+    },
+    add () {
+      this.formData.contentDtoList.push(
+        {
+          content: '',
+          option: ''
+        }
+      )
+    },
+    deleteOne (id) {
+      if (this.formData.contentDtoList.length != 1) {
+        this.formData.contentDtoList.splice(id, 1);
+        return;
+      }
     }
   },
   created () {
@@ -71,4 +244,16 @@ export default {
 }
 
 
-</script>
+</script>
+
+
+<style scoped lang='scss'>
+.zoniot_font {
+    line-height: 32px !important;
+}
+// .scrollBar {
+//     overflow: hidden;
+//     overflow-y: auto;
+//     max-height: 200px;
+// }
+</style>

+ 2 - 2
smart/src/views/vehicleAudit/index.vue

@@ -289,7 +289,6 @@ export default {
       })
     },
     lookDetails (row) {
-      debugger
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/vehicleAudit/detalis.vue',
@@ -306,7 +305,8 @@ export default {
             auditStatus: row.auditStatus,
             reason: row.reason,
             callback: resolve,
-            modular: this.modular
+            modular: this.modular,
+            houseId: row.houseId,
           },
           // showConfirmButton: true,
           // showCancelButton: true,