safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/rongcheng/PaperListNPAJ.vue

@@ -27,9 +27,9 @@
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
             <div class="col-sm-4" style="width: auto;margin-top:8px;float: right">
-                  <export-excel-safe   :data="$parent.$parent.searchData"
+                  <export-excel   :data="$parent.$parent.searchData"
                                   :field="$parent.$parent.excelHeaders"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/exportfile" sql-name="QueryCheckPaper" template-name='安检计划明细'></export-excel>
               <button class="button_spacing button_search" @click="search()">查询</button>
               <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
             </div>
@@ -81,24 +81,16 @@
                       close-on-select
                       condition="f_checker_id = '{}'"></v-select>
           </div>
-          <div class="col-sm-4" style="width: 20%" v-if="$parent.$parent.criteriaShow">
-            <label class="font_normal_body">所属区域</label>
-            <v-select :value.sync="model.f_street" v-model='model.f_street'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='$parent.$parent.streets' placeholder='所属区域'
-                      close-on-select
-                      condition="f_street = '{}'"></v-select>
-          </div>
-          <div class="col-sm-4" style="width: 20%" v-if="$parent.$parent.criteriaShow">
-            <label class="font_normal_body">计划类型</label>
-            <v-select :value.sync="model.f_no_checkplan" v-model='model.f_no_checkplan'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='$parent.$parent.planTypes' placeholder='计划类型'
-                      close-on-select
-                      condition="f_no_checkplan = '{}'"></v-select>
-          </div>
+          <!--<div class="col-sm-4" style="width: 20%" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检类型</label>-->
+            <!--<v-select :value.sync="model.f_safecheck_type" v-model='model.f_safecheck_type'-->
+                      <!--:value-single="true" style="width: 60%"-->
+                      <!--class="select_list select"-->
+                      <!--:options='$parent.$parent.safetype' placeholder='安检类型'-->
+                      <!--close-on-select-->
+                      <!--condition="f_safecheck_type = '{}'"></v-select>-->
+          <!--</div>-->
+
           <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
             <div slot="modal-header" class="modal-header">
               <h4 class="modal-title">
@@ -125,7 +117,6 @@
             <th><nobr>安检状态</nobr></th>
             <th><data-order field="f_offsite_time" name="安检时间"></data-order></th>
             <th><nobr>安检员</nobr></th>
-            <th><nobr>计划类型</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
         </template>
@@ -136,9 +127,8 @@
           <td style="text-align: center">{{row.f_check_type}}</td>
           <td style="text-align: center">{{row.f_address}}</td>
           <td style="text-align: center">{{row.f_entry_status}}</td>
-          <td style="text-align: center">{{row.f_onsite_time}}</td>
+          <td style="text-align: center">{{row.f_offsite_time}}</td>
           <td style="text-align: center">{{row.f_checker_name}}</td>
-          <td style="text-align: center">{{row.f_no_checkplan}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
             <button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
@@ -193,13 +183,12 @@
     export default {
         title: '非民用安检结果查看',
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/QueryCheckPaper', 20, {
                 f_plan_id: 'this.f_plan_id',
                 f_approved: 'this.f_approved',
                 f_entry_status: 'this.f_entry',
                 f_no_checkplan: 'this.f_no_checkplan',
                 f_filialeid: 'this.f_filialeid',
-              f_street: 'this.f_street',
                 orderitem: "'f_offsite_time desc'"
             })
             model.f_plan_id = ''
@@ -229,8 +218,6 @@
                 f_filialeid:this.$login.f.orgid
               },
                 model: model,
-              streets:[],
-              planTypes:[{label:"全部",value:""},{label:"有计划安检",value:"有计划安检"},{label:"无计划安检",value:"无计划安检"}],
                 //searchData:searchData,
                 excelHeaders: {
                 'f_userinfo_code': '客户编号',
@@ -243,7 +230,6 @@
                 },
                 fun: this.$login.f,
                 checkersid: [],
-                streets:[],
                 safetype:[{label:"全部",value:""},
                 {label:"送气",value:"送气类型"},
                 {label:"年度普检",value:"年度普检"}],
@@ -263,7 +249,7 @@
         methods: {
 
             change(row) {
-                //Vue.$login = {jwt: row.f_checker_id}
+                Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {
                     row.f_upload_state = '已传'
                     if (row.f_check_type == '民用') {
@@ -308,7 +294,7 @@
                 this.checkInfo = row
             },
             remind() {
-                this.$resetpost('rs/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}' and uf.f_user_type='非民用'`}}, {
+                this.$resetpost('api/af-safecheck/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}' and uf.f_user_type='非民用'`}}, {
                     resolveMsg: null,
                     rejectMsg: null
                 }).then((res) => {
@@ -398,39 +384,15 @@
             console.log("9999999999999999")
             args.condition+=" and f_check_type='非民用' and f_safecheck_type='年度普检'"
             this.model.search(args.condition, args.model, args.condValue)
-            },
-          //初始化街道 添加小区
-          async initstreets(){
-            this.streetslist = []
-            let HttpReset = new HttpResetClass()
-            let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
-              data: {
-                items: '*',
-                tablename: 't_street',
-                orderitem: 'id',
-                condition: `f_orgid = '${this.$login.f.orgid}'`
-              }
-            }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-            let redata = []
-            req.data.forEach((row, n) => {
-              redata[n] = {
-                label: row.f_street,
-                value: row.f_street,
-                data:row,
-                id:row.id
-              }
-            })
-            this.streets=redata
-          }
+            }
         },
         ready() {
             console.log('这里是PaperList', this.$login.f)
             this.function = this.f
             console.log(this.f)
-            //this.remind()
+            this.remind()
             let gen = select(this)
             co(gen)
-          this.initstreets()
         },
         watch: {
             'model.f_no_checkplan'(val) {

package/src/components/rongcheng/PaperListNPSQ.vue

@@ -27,9 +27,9 @@
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
             <div class="col-sm-4" style="width: auto;margin-top:8px;float: right">
-                  <export-excel-safe   :data="$parent.$parent.searchData"
+                  <export-excel   :data="$parent.$parent.searchData"
                                   :field="$parent.$parent.excelHeaders"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/exportfile" sql-name="QueryCheckPaper" template-name='安检计划明细'></export-excel>
               <button class="button_spacing button_search" @click="search()">查询</button>
               <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
             </div>
@@ -81,15 +81,15 @@
                       close-on-select
                       condition="f_checker_id = '{}'"></v-select>
           </div>
-          <div class="col-sm-4" style="width: 20%" v-if="$parent.$parent.criteriaShow">
-            <label class="font_normal_body">所属区域</label>
-            <v-select :value.sync="model.f_street" v-model='model.f_street'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='$parent.$parent.streets' placeholder='所属区域'
-                      close-on-select
-                      condition="f_street = '{}'"></v-select>
-          </div>
+          <!--<div class="col-sm-4" style="width: 20%" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检类型</label>-->
+            <!--<v-select :value.sync="model.f_safecheck_type" v-model='model.f_safecheck_type'-->
+                      <!--:value-single="true" style="width: 60%"-->
+                      <!--class="select_list select"-->
+                      <!--:options='$parent.$parent.safetype' placeholder='安检类型'-->
+                      <!--close-on-select-->
+                      <!--condition="f_safecheck_type = '{}'"></v-select>-->
+          <!--</div>-->
 
           <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
             <div slot="modal-header" class="modal-header">
@@ -183,13 +183,12 @@
     export default {
         title: '非民用送气结果查看',
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/QueryCheckPaper', 20, {
                 f_plan_id: 'this.f_plan_id',
                 f_approved: 'this.f_approved',
                 f_entry_status: 'this.f_entry',
                 f_no_checkplan: 'this.f_no_checkplan',
                 f_filialeid: 'this.f_filialeid',
-              f_street: 'this.f_street',
                 orderitem: "'f_offsite_time desc'"
             })
             model.f_plan_id = ''
@@ -235,7 +234,6 @@
                 {label:"送气",value:"送气类型"},
                 {label:"年度普检",value:"年度普检"}],
                 criteriaShow:false,
-                streets:[],
                 showModal: false,
                 f_approval_states: this.$appdata.getParam('安检单审核状态'),
                 f_entry_status: this.$appdata.getParam('安检状态'),
@@ -251,13 +249,13 @@
         methods: {
 
             change(row) {
-                //Vue.$login = {jwt: row.f_checker_id}
+                Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {
                     row.f_upload_state = '已传'
                     if (row.f_check_type == '民用') {
-                        this.$goto('Asp-paper-message', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+                        this.$goto('paper-message', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
                     } else {
-                        this.$goto('Asp-paper-message', {
+                        this.$goto('paper-message-nocivil', {
                             f_plan_id: row.f_check_plan_id,
                             item: row,
                             role: 'view'
@@ -296,7 +294,7 @@
                 this.checkInfo = row
             },
             remind() {
-                this.$resetpost('rs/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}'`}}, {
+                this.$resetpost('api/af-safecheck/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}'`}}, {
                     resolveMsg: null,
                     rejectMsg: null
                 }).then((res) => {
@@ -386,30 +384,7 @@
             console.log("9999999999999999")
             args.condition+=" and f_check_type='非民用' and f_safecheck_type='送气类型'"
             this.model.search(args.condition, args.model, args.condValue)
-            },
-          //初始化街道 添加小区
-          async initstreets(){
-            this.streetslist = []
-            let HttpReset = new HttpResetClass()
-            let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
-              data: {
-                items: '*',
-                tablename: 't_street',
-                orderitem: 'id',
-                condition: `f_orgid = '${this.$login.f.orgid}'`
-              }
-            }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-            let redata = []
-            req.data.forEach((row, n) => {
-              redata[n] = {
-                label: row.f_street,
-                value: row.f_street,
-                data:row,
-                id:row.id
-              }
-            })
-            this.streets=redata
-          }
+            }
         },
         ready() {
             console.log('这里是PaperList', this.$login.f)
@@ -418,7 +393,6 @@
             //this.remind()
             let gen = select(this)
             co(gen)
-          this.initstreets()
         },
         watch: {
             'model.f_no_checkplan'(val) {

package/src/components/rongcheng/PaperListSQ.vue

@@ -27,9 +27,9 @@
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
             <div class="col-sm-4" style="width: auto;margin-top:8px;float: right">
-                  <export-excel-safe   :data="$parent.$parent.searchData"
+                  <export-excel   :data="$parent.$parent.searchData"
                                   :field="$parent.$parent.excelHeaders"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/exportfile" sql-name="QueryCheckPaper" template-name='安检计划明细'></export-excel>
               <button class="button_spacing button_search" @click="search()">查询</button>
               <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
             </div>
@@ -81,15 +81,15 @@
                       close-on-select
                       condition="f_checker_id = '{}'"></v-select>
           </div>
-          <div class="col-sm-4" style="width: 20%" v-if="$parent.$parent.criteriaShow">
-            <label class="font_normal_body">所属区域</label>
-            <v-select :value.sync="model.f_street" v-model='model.f_street'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='$parent.$parent.streets' placeholder='所属区域'
-                      close-on-select
-                      condition="f_street = '{}'"></v-select>
-          </div>
+          <!--<div class="col-sm-4" style="width: 20%" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检类型</label>-->
+            <!--<v-select :value.sync="model.f_safecheck_type" v-model='model.f_safecheck_type'-->
+                      <!--:value-single="true" style="width: 60%"-->
+                      <!--class="select_list select"-->
+                      <!--:options='$parent.$parent.safetype' placeholder='安检类型'-->
+                      <!--close-on-select-->
+                      <!--condition="f_safecheck_type = '{}'"></v-select>-->
+          <!--</div>-->
 
           <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
             <div slot="modal-header" class="modal-header">
@@ -183,13 +183,12 @@
     export default {
         title: '民用送气结果查看',
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/QueryCheckPaper', 20, {
                 f_plan_id: 'this.f_plan_id',
                 f_approved: 'this.f_approved',
                 f_entry_status: 'this.f_entry',
                 f_no_checkplan: 'this.f_no_checkplan',
                 f_filialeid: 'this.f_filialeid',
-              f_street: 'this.f_street',
                 orderitem: "'f_offsite_time desc'"
             })
             model.f_plan_id = ''
@@ -231,7 +230,6 @@
                 },
                 fun: this.$login.f,
                 checkersid: [],
-              streets:[],
                 criteriaShow:false,
                 showModal: false,
                 f_approval_states: this.$appdata.getParam('安检单审核状态'),
@@ -248,13 +246,13 @@
         methods: {
 
             change(row) {
-                //Vue.$login = {jwt: row.f_checker_id}
+                Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {
                     row.f_upload_state = '已传'
                     if (row.f_check_type == '民用') {
-                        this.$goto('Asp-paper-message', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+                        this.$goto('paper-message', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
                     } else {
-                        this.$goto('Asp-paper-message', {
+                        this.$goto('paper-message-nocivil', {
                             f_plan_id: row.f_check_plan_id,
                             item: row,
                             role: 'view'
@@ -293,7 +291,7 @@
                 this.checkInfo = row
             },
             remind() {
-                this.$resetpost('rs/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}'`}}, {
+                this.$resetpost('api/af-safecheck/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}'`}}, {
                     resolveMsg: null,
                     rejectMsg: null
                 }).then((res) => {
@@ -383,29 +381,6 @@
               //console.log("9999999999999999")
               args.condition+=" and f_check_type='民用' and f_safecheck_type='送气类型'"
             this.model.search(args.condition, args.model, args.condValue)
-          },
-          //初始化街道 添加小区
-          async initstreets(){
-            this.streetslist = []
-            let HttpReset = new HttpResetClass()
-            let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
-              data: {
-                items: '*',
-                tablename: 't_street',
-                orderitem: 'id',
-                condition: `f_orgid = '${this.$login.f.orgid}'`
-              }
-            }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-            let redata = []
-            req.data.forEach((row, n) => {
-              redata[n] = {
-                label: row.f_street,
-                value: row.f_street,
-                data:row,
-                id:row.id
-              }
-            })
-            this.streets=redata
           }
         },
 
@@ -416,7 +391,6 @@
             //this.remind()
             let gen = select(this)
             co(gen)
-            this.initstreets()
         },
         watch: {
             'model.f_no_checkplan'(val) {