safecheck-client 3.0.33-8 → 3.0.33-80

package/src/components/rongcheng/PaperListNPSQ.vue

@@ -158,6 +158,7 @@
           <td style="text-align: center">{{row.f_checker_name}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            <button class="button_spacing button_search-1"  @click="$parent.$parent.$parent.addpic(row)">添加照片</button>
             <!--<button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                     @click="$parent.$parent.$parent.print(row)">
               打印
@@ -168,6 +169,27 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true">
+      <header slot="modal-header" class="modal-header">
+        上传照片22
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="bolbid"
+            :isupload="true"
+            :isdelete="true"
+            :isusetype="true"
+            :isremark="true"
+            :takeimg="false"
+            isusetype="送气照片"
+          ></safecheck-file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='piclose'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -179,6 +201,7 @@
     import * as Util from '../Util'
     import getNowDate from "../../utils/getNowDate";
     import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+    import safecheckUpload   from "../Util/SafecheckUpload.vue";
 
     //获取json配置文件
     let asyncReady = async function (self) {
@@ -209,6 +232,9 @@
 
     export default {
         title: '非民用送气结果查看',
+        components: {
+            safecheckUpload
+        },
         data() {
             let model = new PagedList('rs/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
@@ -274,10 +300,18 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              bolbid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.bolbid=row.id
+            this.pic=true
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {

package/src/components/rongcheng/PaperListSQ.vue

@@ -163,6 +163,7 @@
           <td style="text-align: center">{{row.f_checker_name}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            <button class="button_spacing button_search-1"  @click="$parent.$parent.$parent.addpic(row)">添加照片</button>
             <!--<button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                     @click="$parent.$parent.$parent.print(row)">
               打印
@@ -173,6 +174,26 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true">
+      <header slot="modal-header" class="modal-header">
+        上传照片
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="bolbid"
+            :isupload="true"
+            :isdelete="true"
+            :isusetype="true"
+            :isremark="true"
+            :takeimg="false"
+            ></safecheck-file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='piclose'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -184,6 +205,7 @@
     import * as Util from '../Util'
     import getNowDate from "../../utils/getNowDate";
     import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+    import safecheckUpload   from "../Util/SafecheckUpload.vue";
 
     //获取json配置文件
     let asyncReady = async function (self) {
@@ -214,6 +236,7 @@
 
     export default {
         title: '民用送气结果查看',
+        components: {safecheckUpload},
         data() {
             let model = new PagedList('rs/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
@@ -230,16 +253,6 @@
             model.f_no_checkplan = ''
             model.f_filialeid = this.$login.f.orgid
             model.f_check_type='民用'
-          // let searchData={
-          //     f_plan_id: this.model.f_checker_id==undefined?"":this.model.f_checker_id,
-          //     f_approved: this.model.f_approved,
-          //     f_entry_status: this.model.f_entry,
-          //     f_no_checkplan:this.model.f_no_checkplan[0],
-          //     f_filialeid: this.model.f_filialeid,
-          //     //orderitem: this.model.f_offsite_time,
-          //     //condition:this.model.condition
-          // }
-            // model.f_subcompany = this.$login.f.f_fengongsi
             return {
               searchData: {
                 condition:"1=1",
@@ -276,10 +289,18 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              bolbid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.bolbid=row.id
+            this.pic=true
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {