safecheck-client 3.0.35-3 → 3.0.35-31

package/src/filiale/bayan/android/SafecheckOrderV.vue

@@ -162,7 +162,7 @@
         //   "f_repair_approved":"未审核","f_no_checkplan":"有计划安检","f_plan_name":"关于","f_repair_approved_by":null,"f_room":"1","f_office":null,"f_comments":null,
         //   "f_address":"兰山街道泰盛小区1栋1单元1层1室","id_back":null,"f_userinfoid":"2","f_subcompany":null,"f_addressid":null,"f_user_phone2":null,
         //   "f_user_equipment_remarks":null,"f_plan_id":"0819ea6707ad4d9dad217c06a87f4227","f_user_name":"用户二",
-        //   "f_plan_meters":[{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2119035714","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":3,"f_maker":null,"f_metergasnums":0,"f_total_fee":100,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663},{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2118999901","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":1,"f_maker":null,"f_metergasnums":0,"f_total_fee":0,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663}]
+        //   "f_plan_meters":[{"f_weizhi":null,"f_pregas":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2119035714","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":3,"f_maker":null,"f_metergasnums":0,"f_total_fee":100,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663},{"f_weizhi":null,"f_pregas":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2118999901","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":1,"f_maker":null,"f_metergasnums":0,"f_total_fee":0,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663}]
         // },
 
         data: {
@@ -255,19 +255,20 @@
               "基表编号":{"index":1,"type":"string","readonly":true},
               "气表型号":{"index":2,"type":"string","readonly":true},
               "气表品牌":{"index":3,"type":"string","readonly":true},
-              "进气方向":{"index":4,"type":"string","readonly":true,isshow:false},
+              "进气方向":{"index":4,"type":"string","readonly":true},
               "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
               "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
-              "累购气量":{"index":7,"type":"number","readonly":true},
+              "表累购气量":{"index":7,"type":"number","readonly":true},
               "累购金额":{"index":7,"type":"number","readonly":true},
-              "已用气量":{"index":8,"type":"number","checkmust": false},//基表数
-              "已用金额":{"index":8,"type":"number","checkmust": false},
-              "剩余气量":{"index":9,"type":"number","checkmust": false},//累购-已用
-              "剩余金额":{"index":9,"type":"number","checkmust": false},
-              "气量异常差值":{"index":10,"type":"number","readonly": true},
-              "金额异常差值":{"index":10,"type":"number","readonly": true},
-              "表箱号":{"index":11,"type":"string","readonly": true},
-              "燃气表照片":{"index":12,"type":"picture","checkmust": false}
+              "户累购气量":{"index":8,"type":"number","readonly":true},
+              "已用气量":{"index":9,"type":"number","checkmust": false},//基表数
+              "已用金额":{"index":9,"type":"number","checkmust": false},
+              "剩余气量":{"index":10,"type":"number","checkmust": false},//累购-已用
+              "剩余金额":{"index":10,"type":"number","checkmust": false},
+              "气量异常差值":{"index":11,"type":"number","readonly": true},
+              "金额异常差值":{"index":11,"type":"number","readonly": true},
+              "表箱号":{"index":12,"type":"string","readonly": true},
+              "燃气表照片":{"index":13,"type":"picture","checkmust": false}
             }
           },
         },
@@ -287,11 +288,12 @@
               "剩余金额":{"index":9,"type":"string","checkmust": false},
               "累购气量":{"index":10,"type":"string","readonly":true},
               "表累购气量":{"index":11,"type":"string","readonly":false},
-              "已用气量":{"index":12,"type":"string","checkmust": false},
-              "剩余气量":{"index":13,"type":"string","checkmust": false},
-              "气量异常差值":{"index":14,"type":"number","readonly": true},
-              "金额异常差值":{"index":15,"type":"number","readonly": true},
-              "燃气表照片":{"index":16,"type":"picture","checkmust": false}
+              "户累购气量":{"index":12,"type":"number","readonly":true},
+              "已用气量":{"index":13,"type":"string","checkmust": false},
+              "剩余气量":{"index":14,"type":"string","checkmust": false},
+              "气量异常差值":{"index":15,"type":"number","readonly": true},
+              "金额异常差值":{"index":16,"type":"number","readonly": true},
+              "燃气表照片":{"index":17,"type":"picture","checkmust": false}
 
             }
           },
@@ -2069,6 +2071,24 @@
                         f_path: "",
                         type: "string"
                       },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "户累购气量",
+                        f_item_value: this.item.f_plan_meters[i].f_pregas,
+                        f_path: "",
+                        type: "string"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "进气方向",
+                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
+                        f_path: "",
+                        type: "string"
+                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2122,6 +2142,24 @@
                         f_path: "",
                         type: "string"
                       },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "户累购气量",
+                        f_item_value: this.item.f_plan_meters[i].f_pregas,
+                        f_path: "",
+                        type: "string"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "进气方向",
+                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
+                        f_path: "",
+                        type: "string"
+                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2148,7 +2186,7 @@
                     //tag)
                     //tag)
                     /*
-                      "累购气量":{"index":8,"type":"number","readonly":true},
+                      "表累购气量":{"index":8,"type":"number","readonly":true},
                       "累购金额":{"index":8,"type":"number","readonly":true},
                       "字轮读数":{"index":9,"type":"number","checkmust": true},
                       "已用金额":{"index":9,"type":"number","checkmust": true},
@@ -2160,7 +2198,7 @@
                     if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
                       if (!this.data.f_collection_type) {
                         this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                        delete this.config['燃气表']['items']['累购气量']
+                        delete this.config['燃气表']['items']['表累购气量']
                         delete this.config['燃气表']['items']['已用气量']
                         delete this.config['燃气表']['items']['剩余气量']
                         delete this.config['燃气表']['items']['气量异常差值']
@@ -2237,7 +2275,7 @@
                             f_defect_level: null,
                             f_device_id: "",
                             f_is_defect: "",
-                            f_item_name: "累购气量",
+                            f_item_name: "表累购气量",
                             f_item_value: this.item.f_plan_meters[i].f_total_gas,
                             f_path: "",
                             type: "number"
@@ -2300,7 +2338,7 @@
                           f_defect_level: null,
                           f_device_id: "",
                           f_is_defect: "",
-                          f_item_name: "累购气量",
+                          f_item_name: "表累购气量",
                           f_item_value: this.item.f_plan_meters[i].f_total_gas,
                           f_path: "",
                           type: "number"
@@ -2381,6 +2419,24 @@
                         f_path: "",
                         type: "string"
                       },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "户累购气量",
+                        f_item_value: this.item.f_plan_meters[i].f_pregas,
+                        f_path: "",
+                        type: "string"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "进气方向",
+                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
+                        f_path: "",
+                        type: "string"
+                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",

package/src/filiale/bayan/android/SafecheckUserInfo.vue

@@ -142,6 +142,10 @@
           </div>
 
         </div>
+        <div class="col-xs-12 row" style="padding: 2px 0">
+            <p class="panel-title col-xs-4 text-left font">临时联系电话</p>
+            <p class="panel-title col-xs-8 text-left input-font">{{ f_rent_phone }}</p>
+        </div>
         <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'">
           <label class="text-left font">到访不遇照片：</label>
           <div class="auto">

package/src/filiale/bayan/pc/PlanManage.vue

@@ -488,6 +488,7 @@
             isSend:false,
             createPlan:{
               f_outlets:'',
+              f_class:'',
               f_end_time:'',
               f_start_time:'',
               f_plan_name:'',
@@ -638,6 +639,7 @@
             f_plan_name:'',
               f_plan_year:'',
               f_plan_month:'',
+            f_class:'',
             f_outlets:'',
               isShare:'否',
               f_issued:'否',

package/src/filiale/bayan/pc/SelectCheckPlan.vue

@@ -59,13 +59,18 @@
             </div>
             <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_check_type" v-model='model.f_check_type'
+              <v-select :value.sync="model.f_check_type" v-model='model.f_check_typef_check_type'
                         :value-single="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checktype' placeholder='客户类型'
                         close-on-select
                         condition="f_check_type = '{}'"></v-select>
             </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body" >小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
+            </div>
             <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
               <label class="font_normal_body" >区&emsp;&emsp;域</label>
               <v-select :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"

package/src/filiale/huaran/android/CheckPlanDown.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="auto">
+
+    <div class="auto">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+          <div partial>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/档案信息.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_plan_name" class="font text-left">计划名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_plan_name" class="search_input input-font"
+                       v-model="model.f_plan_name" condition="f_plan_name like '%{}%'" />
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
+            </div>
+            <!--<div class="row app-btn">-->
+            <!--<button class="btn btn-primary col-xs-6" type="button"  @click="search"><span class="glyphicon  glyphicon-search" style="margin-right: 20px;">查询</span></button>-->
+            <!--</div>-->
+            <div style="height:30px;"></div>
+          </div>
+        </criteria>
+        <list :model="model" partial='list'>
+          <div partial>
+            <div class="auto app-text" style="margin-top: 5px;">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self">
+                  <div class="row">
+                    <p class="panel-title col-xs-4 text-left font">计划名称</p>
+                    <p class="panel-title col-xs-8 text-left input-font">{{ row.f_plan_name }}</p>
+                  </div>
+                  <div class="row">
+                    <p class="panel-title col-xs-4 text-left font">计划时间</p>
+                    <p class="panel-title col-xs-8 text-left input-font">{{ row.f_plan_year }}/{{row.f_plan_month}}</p>
+                  </div>
+                  <!--<div class="row">-->
+                  <!--<p class="panel-title col-xs-4 text-left font">生成人员</p>-->
+                  <!--<p class="panel-title col-xs-8 text-left input-font">{{ row.f_create_operator }}/{{row.f_plan_month}}</p>-->
+                  <!--</div>-->
+                  <!--<div class="row">-->
+                  <!--<p class="panel-title col-xs-4 text-left font">下发人员</p>-->
+                  <!--<p class="panel-title col-xs-8 text-left input-font">{{ row.f_send_operator }}/{{row.f_plan_month}}</p>-->
+                  <!--</div>-->
+                  <div class="row text-right" >
+                    <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.downloadHand(row)' v-if="$parent.$parent.$parent.isDown(row)">下载</button>&nbsp;
+                  </div>
+                </div>
+              </div>
+
+            </div>
+          </div>
+        </list>
+      </criteria-paged>
+    </div>
+    <!--<div class="row text-center" style="margin-top: 20px;">-->
+    <!--<button type="' 正在进行共享计划下载，请确认！' btn-lg btn-font btn-color" style="width: 45%;" @click="downHand()">共享计划下载</button>-->
+    <!--&lt;!&ndash;<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="database()">数据库导出</button>&ndash;&gt;-->
+    <!--</div>-->
+    <!-- <div class="auto" style="padding-top: 20px;" v-if='show'>
+      <p class="text-warning" style="padding: 0 10px">正在下载抄表单...</p>
+    </div> -->
+    <!-- <hand-info v-if="show" :data="handinfo"></hand-info> -->
+    <!-- <div class="auto" v-if="!show">
+      <p class="text-warning" style="padding: 0 10px">
+        暂无可操作的抄表信息
+      </p>
+    </div> -->
+  </div>
+  <!--  <back-page :need-back='true'  @flag="$back()"></back-page>-->
+</template>
+<script>
+import { PagedList } from 'vue-client'
+import co from 'co'
+import Vue from 'vue'
+// const downloadHand = function * (self, row) {
+//
+// }
+
+export default {
+  title: '共享计划下载',
+  data () {
+    return {
+      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`,f_fengongsi_name:`'${Vue.user.orgs.split('.').pop()}'`}),
+      checkPlanInfo: [],
+      localcheckPlanInfo:[]
+    }
+  },
+  ready () {
+
+    this.getlocalCheckPlan()
+  },
+  methods: {
+    reload() {
+      //tag
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    getlocalCheckPlan() {
+      let value = this.$androidUtil.path({alias: 'getLocalCheckPlan', data: {}})
+      //tag
+      this.localcheckPlanInfo = value.data
+      // this.$androidUtil.path({alias: 'getLocalCheckPlan', data:{}}).then((value)=>{
+      //   //tag
+      //   this.localcheckPlanInfo = value.data
+      // })
+    },
+    downloadHand(row) {
+      HostApp.__this__ =this
+      this.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          HostApp.logicWithHint({
+            'logic': 'DownCheckPlanInfo',
+            'callback': 'javascript: HostApp.__this__.downloadHandCallback()',
+            'data': {id: row.id},
+            'backresult': 1
+          })
+        }
+      })
+    },
+    downloadHandCallback(jo) {
+      // 安卓端
+      //tag
+      if (jo.state == 'ok') {
+        let result = JSON.parse(jo.result)
+        if (result.state == 0) {
+          if (result.data.length > 0) {
+            this.getlocalCheckPlan()
+            this.$showMessage('下载成功，您可前往计划导航进行查看！')
+          } else {
+            this.$showMessage('无可下载的共享计划！')
+          }
+        } else {
+          this.$showMessage('下载失败！')
+        }
+      } else {
+        this.$showMessage('下载失败，请重试！')
+      }
+    }
+  },
+  computed: {
+    isDown () {
+      return function (row) {
+        for (let info of this.localcheckPlanInfo) {
+          if (info.id == row.id) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+}
+</script>
+<style>
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  background-color:#499edf;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
+
+</style>

package/src/filiale/huaran/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'check-plan-down': (resolve) => { require(['./android/CheckPlanDown'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/huaran/pc/PlanManage.vue

@@ -20,7 +20,7 @@
              v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
           <table style="width:100%;table-layout:fixed">
             <tr class="safe-planfont">
-              <td rowspan="6"><input type="checkbox" style="pointer-events:auto"
+              <td rowspan="8"><input type="checkbox" style="pointer-events:auto"
                                      v-show="row.plan_count == 0 || row.f_issued == '未下发'"
                                      onClick="event.cancelBubble = true"
                                      :checked="checkplan.check.isChecked(row.f_check_item_id)"
@@ -58,6 +58,18 @@
                   :title="row.f_safecheck_type">{{ row.f_safecheck_type }}
               </td>
             </tr>
+            <tr class="safe-bodyfont" v-if="row.f_share_type">
+              <td colspan="3">共享公司 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_share_type">{{ row.f_share_type }}
+              </td>
+            </tr>
+            <tr class="safe-bodyfont" v-if="row.f_share_company_name">
+              <td colspan="3">分公司名称 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_share_company_name">{{ row.f_share_company_name }}
+              </td>
+            </tr>
           </table>
         </div>
       </div>
@@ -210,6 +222,13 @@
                       value-single>
             </v-select>
           </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">任务性质:</label>
+            <v-select class="select select_list" :search="false" :value.sync="createPlan.f_schedule_type"
+                      v-model="createPlan.f_schedule_type" :options='schedule_types' placeholder='请选择' close-on-select
+                      value-single>
+            </v-select>
+          </div>
           <div class="form-group col-sm-4" v-show="createPlan.isShare == '否'">
             <label class="font_normal_body">部&ensp;&ensp;&ensp;&ensp;门:</label>
             <v-select class="select select_list" :search="false" :value.sync="createPlan.f_department_id"
@@ -233,7 +252,7 @@
                       value-single>
             </v-select>
           </div>
-          <div class="form-group col-sm-4">
+          <div class="form-group col-sm-4" v-if="isSeePlanShare">
             <label class="font_normal_body">共享公司:</label>
             <v-select class="select select_list" :value.sync="createPlan.f_share_type" v-model="createPlan.f_share_type"
                       :search="false" :options='isAndNot' placeholder='请选择' close-on-select value-single>
@@ -298,6 +317,20 @@
                       v-model="upCheckPlan.f_safecheck_type" :options='ntoway' close-on-select value-single>
             </v-select>
           </div>
+          <div class="form-group col-sm-4" v-if="isSeePlanShare">
+            <label class="font_normal_body">共享公司:</label>
+            <v-select class="select select_list" :value.sync="upCheckPlan.f_share_type" v-model="upCheckPlan.f_share_type"
+                      :search="false" :options='isAndNot' placeholder='请选择' close-on-select value-single>
+            </v-select>
+          </div>
+          <div class="form-group col-sm-6" v-if="upCheckPlan.f_share_type == '是'">
+            <label class="font_normal_body">分公司名称:</label>
+            <v-select class="select select_list" :value.sync="upCheckPlan.f_share_company_name"
+                      v-model="upCheckPlan.f_share_company_name" :search="false" :options='companyNameList'
+                      placeholder='请选择'
+                      close-on-select value-single>
+            </v-select>
+          </div>
         </div>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -322,7 +355,10 @@ export default {
       totalTaskList: [],
       departments: [],
       companyNameList: [],
+      // isSeePlanShare: this.$login.r ? this.$login.r.includes("安检任务共享公司") : true,
+      isSeePlanShare: true,
       opt: [{label: "按时间降序", value: "按时间降序"}, {label: "按时间升序", value: "按时间升序"}],
+      schedule_types: [{label: "民用", value: "民用"}, {label: "非民用", value: "非民用"}],
       currentorder: '按时间降序',
       isdelete: this.$login.r ? this.$login.r.includes("安检任务删除") : false,
       checkplan: new SearchList(true),
@@ -342,6 +378,7 @@ export default {
         f_plan_name: '',
         f_total_task_id:'',
         f_plan_year: '',
+        f_schedule_type:'民用',
         f_department_id: '',
         f_plan_month: '',
         isShare: '否',
@@ -576,6 +613,7 @@ export default {
         f_plan_name: '',
         f_plan_year: '',
         f_plan_month: '',
+        f_schedule_type:'民用',
         isShare: '否',
         f_issued: '否',
         f_checker_id: null,
@@ -601,6 +639,10 @@ export default {
         Vue.showMessage("请选择安检月份！")
         return false
       }
+      if (!this.createPlan.f_schedule_type) {
+        Vue.showMessage("请选择任务性质！")
+        return false
+      }
       if (this.createPlan.isShare == "否") {
         if (JSON.stringify(this.createPlan.checker) == '{}') {
           Vue.showMessage("请选择安检人员！")
@@ -691,14 +733,16 @@ export default {
       this.upCheckPlan.f_checker = row.f_checker ? row.f_checker : null
       this.upCheckPlan.isShare = row.f_checker_id ? '否' : '是'
       this.upCheckPlan.f_issued = row.f_issued
+      this.upCheckPlan.f_share_type = row.f_share_type
+      this.upCheckPlan.f_share_company_name = row.f_share_company_name
       this.upCheckPlan.checker = {id: row.f_checker_id, name: row.f_checker}
       this.showUpPlan = true
     },
     async upPlan() {
-      if (this.upCheckPlan.f_issued == '已下发') {
-        this.$showMessage("该任务已下发，无法进行修改！")
-        return
-      }
+      // if (this.upCheckPlan.f_issued == '已下发') {
+      //   this.$showMessage("该任务已下发，无法进行修改！")
+      //   return
+      // }
       if (!this.upCheckPlan.f_plan_name) {
         Vue.showMessage("请输入安检任务名称！")
         return false
@@ -729,6 +773,9 @@ export default {
           f_plan_name: this.upCheckPlan.f_plan_name,
           f_plan_year: this.upCheckPlan.f_plan_year,
           f_plan_month: this.upCheckPlan.f_plan_month,
+          f_share_type: this.upCheckPlan.f_share_type,
+          f_share_company_name: this.upCheckPlan.f_share_type == '否' ? '' : this.upCheckPlan.f_share_company_name,
+          issued:"是",
           f_plan_id: this.upCheckPlan.id
         }
       }, {resolveMsg: null, rejectMsg: null})