Merge branch 'master' of https://gitee.com/meliuxy_456/patrol-maintain-web

up
3 years ago · 6aba1ac38a
parent 232529c969 baa04b7633
commit 6aba1ac38a
4 changed files with 74 additions and 7 deletions
--- a/public/index.html
+++ b/public/index.html
@ -8,8 +8,13 @@
    <title><%= webpackConfig.name %></title>
   <!-- <script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.15&key=53919608dd142b8d4498b43bfdef0792'></script>
    <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script> -->
-    <script type="text/javascript" src='http://webapi.amap.com/maps?v=1.4.11&key=7ab53b28352e55dc5754699add0ad862&plugin=AMap.PlaceSearch'></script>
-    <script src="http://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
+    <script>
+      window._AMapSecurityConfig = {
+        securityJsCode: 'dbc95be996393c8c69e3958bb945ea08',
+      }
+    </script>
+    <script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.11&key=53919608dd142b8d4498b43bfdef0792&plugin=AMap.PlaceSearch'></script>
+    <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
  </head>
  <body>
    <noscript>
--- a/src/main.js
+++ b/src/main.js
@ -50,7 +50,7 @@ Vue.use(preventReClick)

 import Avue from '@smallwei/avue';
 import '@smallwei/avue/lib/index.css';
-// import 'default-passive-events'
+
 Vue.use(Avue);
 Vue.config.productionTip = false

--- a/src/views/rain/inspection/inspection.vue
+++ b/src/views/rain/inspection/inspection.vue
@ -66,7 +66,7 @@
      </div>
      <el-dialog title="雨管养护类型选择" :visible.sync="rainTypeVisible" width="60%">
        <div class="dialogConcent">
-          <el-radio v-model="rainType" label="1">日场雨水设施</el-radio>
+          <el-radio v-model="rainType" label="1">日常雨水设施</el-radio>
          <el-radio v-model="rainType" label="2">在建工地</el-radio>
        </div>

@ -189,7 +189,27 @@
                    <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
                    <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
                  </el-form-item>
-                </el-col>
+                </el-col>
+
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                    <el-form-item label="要求完成时间" prop="complete_date">
+                      <el-date-picker
+                        style="width:100%"
+                        v-model="form.complete_date"
+                        type="datetime"
+                        placeholder="选择时间"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        >
+                      </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                 <el-form-item label="备注" prop="remarks">
+                   <el-input type="textarea" v-model="form.remarks" placeholder="请填写备注" autocomplete="off"></el-input>
+                 </el-form-item>
+                </el-col>
+
+



@ -328,6 +348,23 @@
                      <el-radio :label="2">违法转办</el-radio>
                    </el-radio-group>
                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                    <el-form-item label="要求完成时间" prop="complete_date">
+                      <el-date-picker
+                        style="width:100%"
+                        v-model="form.complete_date"
+                        type="datetime"
+                        placeholder="选择时间"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        >
+                      </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                 <el-form-item label="备注" prop="remarks">
+                   <el-input type="textarea" v-model="form.remarks" placeholder="请填写备注" autocomplete="off"></el-input>
+                 </el-form-item>
                </el-col>
                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
                  <el-form-item label="有无违法转办">
--- a/src/views/rain/order/order.vue
+++ b/src/views/rain/order/order.vue
@ -100,7 +100,6 @@
                    <el-input type="textarea" v-model="form.content" placeholder="请填写内容" autocomplete="off"></el-input>
                  </el-form-item>
                </el-col>
-              </el-row>
              <el-col :span="24">
                <el-form-item label="附件" prop="files_list">
                  <el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
@ -120,7 +119,33 @@
                    </div>
                  </el-upload>
                </el-form-item>
-              </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="是否转派" prop="end_type">
+                  <el-radio-group v-model="form.end_type">
+                    <el-radio :label="0">是</el-radio>
+                    <el-radio :label="1">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.end_type==0">
+                <el-form-item label="要求完成时间" prop="complete_date">
+                  <el-date-picker
+                    style="width:100%"
+                    v-model="form.complete_date"
+                    type="datetime"
+                    placeholder="选择时间"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.end_type==0">
+                <el-form-item label="备注" prop="remark">
+                  <el-input type="textarea" v-model="form.remark" placeholder="请填写备注" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              </el-row>

            </el-form>
          </el-scrollbar>