sale-client 3.6.500 → 3.6.501

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.500",
+  "version": "3.6.501",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -62,7 +62,10 @@
     </div>
     <limit-gas :show.sync="limitShow" :f_userinfo_id="data.baseinfo.base.f_userinfo_id"
                @limit="getLimitGas"></limit-gas>
-    <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+    <modal :show.sync="showfiles" styles="margin-top:50px" v-ref:modal backdrop="false" width="80%" >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="showFilesClose"><span class="glyphicon glyphicon-remove"></span></button>
+      </header>
       <article slot="modal-body">
                 <upload-idcard :blodid="blodid" isremark="true" @getidinfo="confirmIdCard" style="width:auto" fusetype="档案信息"></upload-idcard>
       </article>
@@ -282,6 +285,9 @@ export default {
     }
   },
   methods: {
+    showFilesClose () {
+      this.showfiles = false
+    },
     close () {
       this.printflag = false
     },

package/src/filiale/bayan/Userinfo.vue

@@ -53,7 +53,10 @@
         </div>
         <div class="row">
           <label class="col-sm-5">备用电话</label>
-          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}</span>
+          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}
+          <span v-if="data && data.f_rent_phone" @click.stop="changeUserRentPhone"
+                class="glyphicon glyphicon-pencil  clickchange" title="修正备用电话"></span>
+          </span>
         </div>
         <div class="row" :class="[config.f_user_state ? 'highlight' : '']">
           <label class="col-sm-5">客户状态</label>
@@ -99,7 +102,16 @@
 
         <div class="row" >
           <label class="col-sm-5">保险到期日期</label>
-          <span class="col-sm-7">{{ data ? data.f_ins_stop_date.substr(0, 10) : dafault.f_input_date }}</span>
+          <span class="col-sm-7">{{ data ? data.f_ins_stop_date.substr(0, 10) : dafault.f_input_date }}
+            <span v-if="data"  @click.stop="changeInsStopDate"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正保险到期日期"></span>
+          </span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">保险金额</label>
+          <span class="col-sm-7">{{ data ? data.f_total_ins_charge : dafault.f_total_ins_charge }}
+          <span v-if="data" @click.stop="changeTotalInsCharge"
+                class="glyphicon glyphicon-pencil  clickchange" title="修正保险金额"></span></span>
         </div>
         <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
                v-ref:modal large backdrop="false">
@@ -126,6 +138,96 @@
             <button type="button" class="button_clear" @click='close'>取消</button>
           </footer>
         </modal>
+        <modal v-if="showSelectUserRentPhone" :show.sync="showSelectUserRentPhone" width="40%" title="修正客户备用电话号码"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧备用电话</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_rent_phone" placeholder='旧备用电话'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新备用电话</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newUserRentPhone"
+                         placeholder='新备用电话'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserRentPhone">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showInsStopDate" :show.sync="showInsStopDate" width="40%" title="修正保险到期日期"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧保险到期日期</label>
+                  <datepicker placeholder="旧保险到期日期"
+                              style="width:60%"
+                              class="datepicker"
+                              disabled
+                              v-model="data.f_ins_stop_date"
+                              :value.sync="data.f_ins_stop_date"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+<!--                  <input disabled readonly type="text" style="width:80%" class="input_search"-->
+<!--                         v-model="data.f_ins_stop_date" placeholder='旧保险到期日期'>-->
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新保险到期日期</label>
+                  <datepicker placeholder="新保险到期日期"
+                              style="width:60%"
+                              class="datepicker"
+                              v-model="newInsStopDate"
+                              :value.sync="newInsStopDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+<!--                  <input type="text" style="width:80%" class="input_search" v-model="newInsStopDate"-->
+<!--                         placeholder='新保险到期日期'>-->
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyInsStopDate">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showChangeTotalInsCharge" :show.sync="showChangeTotalInsCharge" width="40%" title="修改保险金额"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧保险金额</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_total_ins_charge" placeholder='旧保险金额'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新保险金额</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newTotalInsCharge"
+                         placeholder='新保险金额'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyTotalInsCharge">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
         <modal v-if="reason_show" :show.sync="reason_show" width="40%" title="修改备注信息"
                v-ref:modal large backdrop="false">
           <article slot="modal-body" class="modal-body">
@@ -208,7 +310,8 @@ export default {
         f_rent_phone: '************',
         f_comments: '**',
         f_user_state: '****',
-        f_contract_id: '*************'
+        f_contract_id: '*************',
+        f_total_ins_charge: '*************'
       },
       config: {
         f_user_name: false,
@@ -226,7 +329,13 @@ export default {
       model: null,
       showselectncuserinfo: false,
       showselectncuseridnumber: false,
+      showSelectUserRentPhone: false,
+      showInsStopDate: false,
+      showChangeTotalInsCharge: false,
+      newTotalInsCharge: '',
       newuserphone: '',
+      newUserRentPhone: '',
+      newInsStopDate: '',
       reason_show: false,
       newuseridnumber: '',
       new_reason: ''
@@ -292,6 +401,18 @@ export default {
       this.showselectncuserinfo = true
       this.newuserphone = ''
     },
+    changeUserRentPhone () {
+      this.showSelectUserRentPhone = true
+      this.newUserRentPhone = ''
+    },
+    changeInsStopDate () {
+      this.showInsStopDate = true
+      this.newInsStopDate = ''
+    },
+    changeTotalInsCharge () {
+      this.showChangeTotalInsCharge = true
+      this.newTotalInsCharge = ''
+    },
     async modifyUser () {
       let param = {
         new_userphone: this.newuserphone,
@@ -311,13 +432,76 @@ export default {
       this.$parent.$parent.$refs.list.searchNoData()
       this.close()
     },
+    async modifyUserRentPhone () {
+      let param = {
+        new_rentphone: this.newUserRentPhone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_rent_phone = this.newUserRentPhone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    async modifyInsStopDate () {
+      let param = {
+        new_insStopDate: this.newInsStopDate,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_ins_stop_date = this.newInsStopDate
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    async modifyTotalInsCharge () {
+      let param = {
+        new_totalInsCharge: this.newTotalInsCharge,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_total_ins_charge = this.newTotalInsCharge
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
     close () {
       this.showselectncuserinfo = false
+      this.showSelectUserRentPhone = false
+      this.showInsStopDate = false
+      this.showChangeTotalInsCharge = false
       this.reason_show = false
       this.showselectncuseridnumber = false
       this.newuserphone = ''
       this.new_reason = ''
       this.new_idnumber = ''
+      this.newUserRentPhone = ''
+      this.newInsStopDate = ''
+      this.newTotalInsCharge = ''
     }
   },
   watch: {

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -62,6 +62,7 @@ export default {
           id: sellId,
           eticket_id: row.id,
           f_charge_type: type,
+          charge_item: type,
           f_invoice_type: 0,
           invoice_type: 0,
           invoice_kind: row.f_paper_type,

package/src/filiale/yangchun/FilesManage/UserGeneralInfoTest.vue

@@ -72,7 +72,10 @@
     </div>
     <limit-gas :show.sync="limitShow" :f_userinfo_id="data.baseinfo.base.f_userinfo_id"
                @limit="getLimitGas"></limit-gas>
-    <modal :show.sync="showfiles" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
+    <modal :show.sync="showfiles" styles="margin-top:50px" v-ref:modal backdrop="false" width="80%" >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="showFilesClose"><span class="glyphicon glyphicon-remove"></span></button>
+      </header>
       <article slot="modal-body">
         <upload-idcard :blodid="blodid" isremark="true" @getidinfo="confirmIdCard" style="width:auto"
                        fusetype="档案信息" v-ref:upload></upload-idcard>
@@ -358,6 +361,9 @@ export default {
     }
   },
   methods: {
+    showFilesClose () {
+      this.showfiles = false
+    },
     permission (name) {
       console.log('>>> 开票信息修改权限 --> ' + name)
       console.log('权限：', this.$login.r)

package/src/filiale/yangchun/HandplanQuery.vue

@@ -281,6 +281,17 @@
                             condition="f_totalsplit_type = '{}'">
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">使用类型</label>
+                  <v-select :value.sync="model.f_usetype"
+                            v-model="model.f_usetype"
+                            :options='$parent.$parent.usetype'
+                            placeholder='使用类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_usetype = '{}'">
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -436,6 +447,9 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>使用类型</nobr>
+                </th>
                 <th>
                   <nobr>备注</nobr>
                 </th>
@@ -595,6 +609,9 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_orgname }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_usetype }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_comments }}</nobr>
               </td>
@@ -1282,6 +1299,9 @@ export default {
     handstate () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
     },
+    usetype () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+    },
     // inputtor() {
     //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
     // },

package/src/sign.html

@@ -15,14 +15,25 @@
     }
     .s_conLeft {
       width: 75%;
-      height: 100%;
+      height: 100vh;
       float: left;
       background: #ffffff;
+      overflow: auto;
+      position: relative;
+    }
+    #div_scroll {
+      width: 100%;
+      height: 100%;
+      overflow-y: auto;
+      overflow-x: hidden;
+      -ms-overflow-style: scrollbar; /* IE和Edge */
+      scrollbar-width: normal; /* Firefox */
     }
     .s_conLeftsing {
       width: 100%;
       height: 1000px;
       border: none;
+      display: block;
     }
     .s_conRight {
       width: 25%;
@@ -32,9 +43,10 @@
     }
     .sign_window {
       width: 300px;
-      position: absolute;
+      position: fixed;
       right: 20px;
       top: 100px;
+      z-index: 1002;
     }
     #open_close_sign {
       float: right;
@@ -70,6 +82,17 @@
       margin: 5px;
       background: #ffffff;
       border: 1px solid #e0e0e0;
+      position: relative;
+      z-index: 1000;
+    }
+    #TInputSign {
+      position: relative;
+      z-index: 1001;
+      background: transparent;
+    }
+    .sign_place, .sign_dashed {
+      position: absolute;
+      z-index: 999;
     }
     .sign_place {
       float: left;
@@ -148,14 +171,75 @@
     ok = _buttonInfo("TInput_click_ok", obj_ok);
     var obj_resign = document.getElementById("button_resign");
     resign = _buttonInfo("TInput_click_resign", obj_resign);
-    var close_open=document.getElementById("open_close_sign");
+    var close_open = document.getElementById("open_close_sign");
     close_open_btn = _buttonInfo("TInput_close_open", close_open);
+
+    // 添加上下滚动按钮的信息
+    var scrollDiv = document.getElementById("div_scroll");
+    if(scrollDiv) {
+      var scroll_up = _buttonInfo("Move_Up_Btn", scrollDiv);
+      var scroll_down = _buttonInfo("Move_Down_Btn", scrollDiv);
+      activex = _objectInfo(obj);
+      return ok + resign + close_open_btn + scroll_up + scroll_down + activex;
+    }
+
     activex = _objectInfo(obj);
-    s = ok + resign + close_open_btn + activex;
-    return s;
+    return ok + resign + close_open_btn + activex;
   }
 
   // <!-- 笔响应支持脚本结束 -->
+  // 添加滚动控制变量
+  var scrollTimer = null;
+  var scrolling = false;
+  var scrollStep = 30;  // 减小单次滚动步长
+  var scrollInterval = 10;  // 缩短滚动间隔时间
+
+  function smoothScroll(direction) {
+    if (scrollTimer) return;  // 如果已经在滚动则不重复启动
+
+    var scr = document.getElementById("div_scroll");
+    if (!scr) return;
+
+    function doScroll() {
+      var currentPos = scr.scrollTop;
+      var maxScroll = scr.scrollHeight - scr.clientHeight;
+
+      if (direction === 'up') {
+        if (currentPos <= 0) {
+          clearInterval(scrollTimer);
+          scrollTimer = null;
+          return;
+        }
+        scr.scrollTop = Math.max(0, currentPos - scrollStep);
+      } else {
+        if (currentPos >= maxScroll) {
+          clearInterval(scrollTimer);
+          scrollTimer = null;
+          return;
+        }
+        scr.scrollTop = Math.min(maxScroll, currentPos + scrollStep);
+      }
+    }
+
+    scrollTimer = setInterval(doScroll, scrollInterval);
+  }
+
+  function stopScroll() {
+    if (scrollTimer) {
+      clearInterval(scrollTimer);
+      scrollTimer = null;
+    }
+  }
+
+  function move_up() {
+    smoothScroll('up');
+  }
+
+  function move_down() {
+    smoothScroll('down');
+  }
+
+  // 优化事件处理
   window.onload = function(){
     obj = document.getElementById("TInputSign");
     obj.TInputSetString("license","VFZNMGQweHFRWFZOVVNVelJDVXpSQSUzRCUzRA=");
@@ -166,6 +250,14 @@
       obj.TInputMovetoExt();
       obj.TInputRegisterButtonInfo(TInput_getButtonsInfo());
     }, 600);
+
+    // 添加滚动结束监听
+    var scrollDiv = document.getElementById("div_scroll");
+    if(scrollDiv) {
+      scrollDiv.onmouseleave = function() {
+        stopScroll();  // 鼠标离开时停止滚动
+      };
+    }
   }
   window.onunload=function(){
     obj.TInputFinalize();
@@ -221,97 +313,67 @@
 
   //控件调用绑定的函数
   function TInput_click_ok(){
+    stopScroll();  // 点击确认时停止滚动
     button_click_ok();
   }
   function TInput_click_resign(){
+    stopScroll();  // 点击重签时停止滚动
     button_click_resign();
   }
   function TInput_close_open(){
+    stopScroll();  // 点击关闭时停止滚动
     close_open_button();
   }
   function Move_Up_Btn(){
     // document.getElementById("div1").style.backgroundColor="#000000";
     move_up();
   }
-  function move_up(){
-    // alert('up')
-    GoTop()
-  }
   function Move_Down_Btn(){
     // document.getElementById("div1").style.backgroundColor="#000000";
     move_down();
   }
-  function move_down(){
-    // alert('down')
-    GoBottom();
-  }
-
-  var currentPosition;
-  function GoTop() {
-    var scr = document.getElementById("div_scroll");
-    currentPosition = scr.scrollTop;
 
-    currentPosition -= 300;
-    if (currentPosition > 0) {
-      scr.scrollTop = currentPosition;
-      // scr.scrollTo(0, currentPosition);
-      // timer = setInterval("GoTop()", 10);
-    } else {
-      currentPosition = 0;
-      scr.scrollTop = currentPosition;
-      // scr.scrollTo(0, 0);
-
-      // window.clearInterval(timer);
-    }
-
-  }
-  var currentPosition2;
-  function GoBottom() {
-    var scr = document.getElementById("div_scroll");
-    // console.log('down');
-    // var scr = document.body;
-    currentPosition2 = scr.scrollTop;
-
-    currentPosition2 += 300;
-    if (currentPosition2 <= 3000) {
-      scr.scrollTop = currentPosition2;
-      // scr.scrollTo(0,currentPosition2);
-      // timer2 = setInterval("GoBottom()", 100);
-    } else {
-      scr.scrollTop = 3000;
-      // currentPosition = 1000;
-      // scr.scrollTo(0,1000);
-      // window.clearInterval(timer2);
-    }
-  }
-
-  /*
-   *回调
-   */
-  function TInputSignWebButtonClickCallback()
-  {
+  // 修改回调函数，优化滚动触发
+  function TInputSignWebButtonClickCallback() {
     var fname = obj.GetClickedFuncname();
-    if(fname == "TInput_click_ok")
-    {
+    if(fname == "TInput_click_ok") {
+      stopScroll();  // 点击确认时停止滚动
       button_click_ok();
     }
-    if(fname == "TInput_click_resign")
-    {
+    else if(fname == "TInput_click_resign") {
+      stopScroll();  // 点击重签时停止滚动
       button_click_resign();
     }
-    if(fname == "TInput_close_open")
-    {
+    else if(fname == "TInput_close_open") {
+      stopScroll();  // 点击关闭时停止滚动
       close_open_button();
     }
-    if(fname == "Move_Up_Btn")
-    {
+    else if(fname == "Move_Up_Btn") {
       move_up();
     }
-    if(fname == "Move_Down_Btn")
-    {
+    else if(fname == "Move_Down_Btn") {
       move_down();
     }
   }
+
+  // 添加笔迹移动事件处理
+  function TInputPenMove(x, y) {
+    var scrollDiv = document.getElementById("div_scroll");
+    var objRect = obj.getBoundingClientRect();
+    var scrollRect = scrollDiv.getBoundingClientRect();
+
+    // 计算相对位置
+    var relativeY = y - scrollRect.top;
+
+    // 如果笔迹接近底部，向下滚动
+    if (relativeY > scrollRect.height - 50) {
+      scrollDiv.scrollTop += 20;
+    }
+    // 如果笔迹接近顶部，向上滚动
+    else if (relativeY < 50) {
+      scrollDiv.scrollTop -= 20;
+    }
+  }
 </script>
 <div class="s_content">
   <!--  <iframe class="s_conLeftsing" id="singurl"></iframe>-->