system-clients 3.2.88-temp → 3.2.88-tongchuan

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

package/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.88-temp",
+  "version": "3.2.88-tongchuan",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/server/ResSelect.vue

@@ -161,9 +161,6 @@
       'parentresid'(){
         this.dealdata()
       },
-      'initresid'(){
-        this.dealdata()
-      }
     },
   }
 </script>

package/src/filiale/tongchuan/Main.vue

@@ -308,6 +308,7 @@ let createWaterMark = function (userName) {
     },
     ready() {
       getwartermakr(this);
+      this.getTimesgotoWzkfPage()
       let component = this.$login.getUrlCompileParames('component')
       if (component) {
         this.isManger = true
@@ -479,6 +480,20 @@ let createWaterMark = function (userName) {
           this.newTipShow = true
         }
       },
+      getTimesgotoWzkfPage(){
+        let teltimes = 2*60*1000 // 两分钟
+        try {
+          this.intervaltx =setInterval(()=>{
+            let msg = localStorage.getItem('wzKfMessage')
+            if(msg){
+              localStorage.removeItem('wzKfMessage')
+              this.$showMessage(`你有${msg}条客户消息待处理,请尽快前往文字客服页面进行处理`)
+            }
+          },teltimes)
+        }catch (e) {
+          console.log('捕获到异常', e)
+        }
+      },
       getTimesgotoWorkOrderSite(){
         let teltimes = 2*60*1000 // 两分钟
         try {

package/src/filiale/bayan/PosAdd.vue

@@ -1,368 +0,0 @@
-<template>
-  <div class="auto select-overspread">
-    <validator name='v'>
-      <ul class="nav nav-tabs" >
-        <li role="presentation" class="active"><a href="#">POS</a></li>
-      </ul>
-      <form novalidate class="form-horizontal" >
-        <div class="row">
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">设备负责人</label>
-            <right-tree @re-res="getRes" :source="source"></right-tree>
-          </div>
-          <div class="col-sm-6 form-group"  :class="[$v.f_terminal_number.required ? 'has-error' : '']">
-            <label class="font_normal_body">设备编号</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" v-el:f_terminal_number
-                   v-validate:f_terminal_number='{required :true}' />
-          </div>
-          <div class="col-sm-6 form-group"  :class="[$v.f_terminal_name.required ? 'has-error' : '']">
-            <label class="font_normal_body">&ensp;设备名称&ensp;</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称"
-                   v-validate:f_terminal_name='{required: true}' />
-          </div>
-          <div class="col-sm-6 form-group"  :class="{'has-error': $v.f_equipment_type.required}">
-            <label class="font_normal_body">设备类型</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_equipment_type" placeholder="设备类型"
-                   v-validate:f_equipment_type="{required: true}" />
-          </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body" >&ensp;MAC&nbsp;号&nbsp;&ensp;</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_mac_number" placeholder="MAC号" >
-          </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body" >机器编号</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
-          </div>
-          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required}">
-            <label class="font_normal_body">&ensp;联系电话&ensp;</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话"
-                   v-validate:f_phone="{required: true, minlength:7, maxlength: 11}" title="手机号必须7-11位">
-            <!--            <div class="font_normal_body" v-if="$v.f_phone.minlength || $v.f_phone.maxlength"><span>手机号必须7-11位</span></div>-->
-          </div>
-          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_bank_name.required}">
-            <label class="font_normal_body">所属银行</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_bank_name"
-                      placeholder='所属银行'
-                      :value.sync="model.f_bank_name"
-                      :options='bankAffiliation'
-                      :value-single="true"
-                      v-validate:f_bank_name="{ required: true }"
-                      close-on-select clear-button>
-            </v-select>
-          </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">&ensp;所属参数&ensp;</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_param_id"
-                      placeholder='所属参数'
-                      :value.sync="model.f_param_id"
-                      :options='ParamTypeItems'
-                      close-on-select clear-button>
-            </v-select>
-          </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">所属部门</label>
-            <res-select restype='department'
-                        :is-mul="false"
-                        @res-select="getdep"
-                        :parentresid="depresid"
-                        :initresid="initresid">
-            </res-select>
-          </div>
-          <div class="col-sm-6  form-group" v-show="false">
-            <label class="font_normal_body">公&emsp;&emsp;司 </label>
-            <right-tree @re-res="getRes1"></right-tree>
-          </div>
-          <div class="col-sm-12 form-group" :class="{'has-error': $v.f_address.required}">
-            <label class="font_normal_body">&ensp;放置地点&ensp;</label>
-            <input type="text" class="input_search" style="width: 80%" v-model="model.f_address" placeholder="所在地"
-                   v-validate:f_address="{required: true}">
-          </div>
-        </div>
-        <div  class="col-sm-12 form-group">
-          <label  class="font_normal_body " >&ensp;&nbsp;&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;&ensp;</label>
-          <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
-        </div>
-      </form>
-      <div style="text-align:right;height:auto;">
-        <button class="button_search"  @click="uploadFiles()" v-if="info">上传图片</button>
-        <button class="btn btn-info" @click="upgrade()" v-if="info && data.f_state==='正常'">升级</button>
-        <button class="btn btn-success" @click="getEditState()"  v-if="model.f_state === '停用' && info" >启用</button>
-        <button class="btn btn-danger" @click="getEditState()"  v-if="model.f_state === '正常' &&  info" >停用</button>
-        <button class="btn button_search" @click="confirm()" :disabled="!$v.valid" >确认</button>
-        <button class="btn button_clear " @click="cancel()" >取消</button>
-      </div>
-      <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
-        <article slot="modal-body" style="height: 500px">
-          <upload v-show="showfiles" :businessid="model.id" v-ref:upload  fusetype="POS" isremark="true" style="width:auto" ></upload>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-        </footer>
-      </modal>
-      <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false" >
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="close"><span>&times;</span></button>
-          <h4 class="modal-title">pos机升级</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <form class="form-horizontal">
-            <div class="row">
-              <div>
-                <h4>是否升级？</h4>
-              </div>
-              <!--              <div class="col-sm-6 form-group">-->
-              <!--                <label class="font_normal_body">参数名称</label>-->
-              <!--                <input type="text" class="input_search" style="width: 60%" v-model="modifyItem.name" @keyup.enter="confirm">-->
-              <!--              </div>-->
-              <!--              <div class="col-sm-6 form-group" v-if="modifyItem.EntityType === 't_parameter'">-->
-              <!--                <div class="checkbox">-->
-              <!--                  <label>-->
-              <!--                    <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局-->
-              <!--                  </label>-->
-              <!--                </div>-->
-              <!--              </div>-->
-            </div>
-          </form>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="button_search button_spacing" @click='upgradeRoot()'>是</button>
-          <button type="button" class="button_clear button_spacing" @click='close'>否</button>
-        </footer>
-      </modal>
-    </validator>
-
-  </div>
-</template>
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-export default {
-  data () {
-    return {
-      depname: '',
-      f_depid: '',
-      orgname: '',
-      initresid: [], // 用于存放初始化选中的部门 ID
-      depresid: [this.$login.f.depids],
-      depid: [this.f_depid],
-      f_orgid: this.$login.f.orgid,
-      userresid: [this.$login.f.id],
-      checkparam: false,
-      bankAffiliation: this.$appdata.getParam('所属银行'),
-      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-      userid: this.$login.f.id,
-      model: {
-        f_terminal_number: '',
-        f_terminal_name: '',
-        f_depname: '',
-        f_mac_number:'',
-        // f_username:'',
-        f_bank_name: '微信',
-        f_equipment_type: 'POS',
-        f_state: '正常',
-        f_machine_number: '',
-        f_phone:'',
-        f_comments:'',
-        f_address:'',
-        f_filialeids: '',
-        f_orgid:'',
-        f_param_id:''
-      },
-      ParamTypeItems:[],
-      showfiles: false,
-      show:false,
-      infoadd: this.infoadd,
-      isSelPop: false
-    }
-  },
-  props: ['data', 'f_filialeids','info'],
-
-  watch: {
-    'data' (val) {
-      if (val) {
-        this.edit(val)
-      } else {
-        this.initModel()
-      }
-    }
-  },
-  async ready () {
-    console.log('mac信息：', this.data)
-    if (this.data) {
-      this.edit(this.data)
-    }
-    console.log('查看是否隐藏', this.info)
-    try {
-      // 获取参数
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/get_posParam', {data: {condition : ' 1 = 1 '}}, {
-        resolveMsg: null,
-        rejectMsg: '获取参数出错！！'
-      })
-      this.ParamTypeItems = res.data.map(item=>{
-        return {
-          label:item.name,
-          value:item.f_param_id
-        }
-      })
-    } catch (e) {
-      console.log(e)
-    }
-  },
-
-  methods: {
-    getRes1 (obj) {
-      this.orgname = obj.res[0]
-      this.depresid = obj.resids
-      this.f_orgid = obj.resids
-      this.userresid = obj.resids
-    },
-    getdep (obj, val) {
-      this.depname = val
-      // this.userresid = obj
-      this.f_depid = obj
-    },
-    recursiveSelOrg(val, flag){
-      if(val.parent){
-        if(val.parent.resourcetype===flag){
-          return {id: val.parent.id, name: val.parent.name}
-        } else {
-          return this.recursiveSelOrg(val.parent,flag)
-        }
-      } else {
-        return {id: '', name: ''}
-      }
-    },
-    getRes(val){
-      console.log('====================', val)
-      if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
-
-        let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
-        this.model.f_orgid=org.id
-        this.model.f_orgname=org.name
-        let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
-        this.model.f_depid=dep.id
-        this.model.f_depname=dep.name
-
-        this.model.f_operatorid = val.orgobj[0].userid
-        this.model.f_operator=val.orgobj[0].name
-        this.isSelPop = true
-      } else {
-        // 不可提交
-        this.isSelPop = false
-      }
-    },
-    close () {
-      this.show = false
-    },
-    uploadFiles(){
-      this.showfiles= !this.showfiles
-    },
-    getEditState () {
-      if (this.model.f_state === '正常') {
-        this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认停用该设备？`, ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送停用指令，请稍后查看执行结果！`, 'success', 2500)
-            this.model.f_state = '停用'
-            try {
-              // 测试接口
-              // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
-              //   .then((res) => {})
-              this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
-            } catch (error) {
-              this.search()
-            }
-          }
-        })
-      } else if (this.model.f_state === '停用'){
-        this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认启用该设备？`, ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送启用指令，请稍后查看执行结果！`, 'success', 2500)
-            this.model.f_state = '正常'
-            try {
-              // 测试接口
-              // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
-              //   .then((res) => {})
-              this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
-            } catch (error) {
-              this.search()
-            }
-          }
-        })
-      }
-    },
-    editBeizhu  (val) {
-      this.editshow = true
-      this.posBase = val
-    },
-
-    //升级
-    upgrade(){
-      this.show=true
-    },
-    upgradeRoot() {
-      this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
-      this.$dispatch('refresh')
-    },
-    search () {
-      this.$refs.paged.$refs.cri.search()
-    },
-    confirm () {
-      // 如果是修改的话，只修改页面上用户填写的信息
-      this.model.f_depname = this.depname[0]
-      this.model.f_depid = this.f_depid[0]
-      if (!this.info) {
-        this.model.f_online = '离线'
-        this.model.f_operator = this.$login.f.name
-        this.model.f_orgid = this.$login.f.orgid
-        this.model.f_filialeids = this.$login.f.orgid
-        this.model.f_operatorid = this.$login.f.id
-        this.model.f_orgname = this.$login.f.orgs
-        // this.model.f_depname=this.depname[0]
-        this.model.f_orgstr = this.$login.f.fullids
-      }
-      this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
-        this.$dispatch('refresh')
-      }).catch((error) => {
-        this.$dispatch('refresh')
-      })
-
-    },
-    edit (row) {
-      this.model.f_terminal_number = row.f_terminal_number
-      this.model.f_terminal_name = row.f_terminal_name
-      this.model.f_bank_name = row.f_bank_name
-      this.model.f_machine_number = row.f_machine_number
-      this.model.f_mac_number = row.f_mac_number
-      this.model.f_address = row.f_address
-      this.model.f_phone = row.f_phone
-      this.model.f_state = row.f_state
-      this.model.f_comments=row.f_comments
-      this.model.f_param_id=row.f_param_id
-      // this.model.f_username=row.f_username
-      this.model.id = row.id
-      this.model.f_filialeids=row.f_filialeids
-      this.model.f_orgid = row.f_orgid
-      this.model.f_depname = row.f_depname
-      this.initresid = [row.f_depid]
-    },
-    initModel () {
-      delete this.model.id
-      this.model.f_terminal_number = ''
-      this.model.f_terminal_name = ''
-      this.model.f_bank_name = ''
-      this.model.f_machine_number = ''
-      this.model.f_state = '正常'
-      this.model.f_phone = ''
-      this.model.f_param_id = ''
-      this.model.f_address = ''
-      this.model.f_filialeids = ''
-      this.model.f_orgid = ''
-      this.model.f_comments = ''
-    },
-    cancel() {
-      this.$dispatch('close')
-    }
-  }
-}
-</script>

package/src/filiale/bayan/PosList.vue

@@ -1,343 +0,0 @@
-<template>
-  <div class="flex">
-    <criteria-paged :model="model" v-ref:paged>
-
-      <criteria partial='criteria' style="background-color: white;" @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">公&emsp;&emsp;司 </label>
-              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">设备编号</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
-                      condition="f_terminal_number like '%{}%'" placeholder="设备编号">
-            </div>
-
-
-            <div class="span" style="float:right;margin-top: 6px">
-              <button type="button" class="btn-success btn " style="border-radius: 4px"
-                      @click="$parent.$parent.batchRoot('1')">批量启用
-              </button>
-              <button type="button" class="btn-danger btn " style="border-radius: 4px"
-                      @click="$parent.$parent.batchRoot('0')">批量停用
-              </button>
-              <button type="button" class="button_search btn" @click="search()" v-el:cx>查询</button>
-              <button type="button" class="button_search btn" @click="$parent.$parent.add() " v-el:cx>新增</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>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">所属部门</label>
-              <res-select restype='department'
-                          :is-mul="false"
-                          @res-select="$parent.$parent.getdep"
-                          :parentresid="$parent.$parent.depresid">
-              </res-select>
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">所属人员</label>
-              <res-select restype='user'
-                          @res-select="$parent.$parent.getuser"
-                          :is-mul="false"
-                          :parentresid="$parent.$parent.userresid">
-              </res-select>
-            </div>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body">所在地</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_address"
-                      condition="f_address like '%{}%'" placeholder="所在地">
-            </div>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body">设备名称</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
-                      condition="f_terminal_name like '%{}%'" placeholder="设备名称">
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">机器编号</label>
-              <input  type="text" class="input_search" style="width:60%"  v-model="model.f_machine_number"
-                      condition="f_machine_number like '%{}%'" placeholder="机器编号">
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">所属银行</label>
-              <v-select id="f_charge_type"
-                        v-model="model.f_bank_name"
-                        placeholder='所属银行'
-                        :value.sync="model.f_bank_name"
-                        :options='$parent.$parent.bankAffiliation'
-                        condition="f_bank_name = '{}'"
-                        close-on-select clear-button>
-              </v-select>
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">联系电话</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_phone"
-                      condition="f_phone like '%{}%'" placeholder="联系电话">
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid >
-        <template partial='head'>
-          <tr>
-            <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></th>
-            <th style="text-align:center;white-space:nowrap;">序号</th>
-            <th style="text-align:center;white-space:nowrap;">设备编号</th>
-            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
-            <th style="text-align:center;white-space:nowrap;">设备名称</th>
-            <!--            <th style="text-align:center;white-space:nowrap;">所属公司</th>-->
-            <th style="text-align:center;white-space:nowrap;">所属部门</th>
-            <th style="text-align:center;white-space:nowrap;">所属人员</th>
-            <th style="text-align:center;white-space:nowrap;">状态</th>
-            <th style="text-align:center;white-space:nowrap;">联系电话</th>
-            <th style="text-align:center;white-space:nowrap;">所在地</th>
-            <th style="text-align:center;white-space:nowrap;">所属银行</th>
-            <!--            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>-->
-            <!--            <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
-            <th style="text-align:center;white-space:nowrap;">备注</th>
-            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
-            <th style="text-align:center;white-space:nowrap;">失联状态</th>
-            <th style="text-align:center;white-space:nowrap;">操作</th>
-          </tr>
-        </template>
-        <template partial='body':model="model">
-          <tr>
-            <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
-            <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
-            <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
-            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
-            <!--            <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>-->
-            <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
-
-            <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
-            <!--            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>-->
-            <!--            <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
-            <td style="text-align:center;white-space:nowrap;">{{row.f_comments}}</td>
-            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
-            <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
-            <td style="text-align:center">
-              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-  <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
-    <article slot="modal-body" class="modal-body">
-      <criteria-paged :model="model2" v-ref:paged2>
-        <data-grid :model="model2" v-ref:grid2  partial='list'>
-          <template partial='head'>
-            <tr>
-              <!--<th style="padding: 0;border: 0">
-                <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
-                       @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
-              </th>-->
-              <th><nobr>序号</nobr></th>
-              <th><nobr>终端号</nobr></th>
-              <th><nobr>上次上报时间</nobr></th>
-              <th><nobr>本次上报时间</nobr></th>
-              <th><nobr><b>状态</b></nobr></th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <td style="text-align: center;">{{$index + 1}}</td>
-            <td style="text-align: center;">{{row.f_terminal_number}}</td>
-            <td style="text-align: center;">{{row.f_update_date}}</td>
-            <td style="text-align: center;">{{row.f_update_date }}</td>
-            <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
-    </footer>
-  </modal>
-</template>
-
-<script>
-
-import {PagedList} from 'vue-client'
-
-export default {
-  title: '终端控制',
-  components: {},
-  data () {
-    return {
-      depresid: [this.$login.f.depids],
-      depid: [this.$login.f.depids],
-      f_orgid: this.$login.f.orgid,
-      f_depid: '',
-      f_operatorid: '',
-      mul: false,
-      orgname: '',
-      depname: '',
-      operatorname: '',
-      userresid: [this.$login.f.id],
-      operatorid: [this.$login.f.id],
-      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-      model: new PagedList('rs/sql/equipmentQuery', 20),
-      model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
-      curorgid: [this.f_filialeid],
-      f_filialeids: '',
-      criteriaShow: false,
-      infoadd: false,
-      selPos: [],
-      bankAffiliation: this.$appdata.getParam('所属银行'),
-      isSelAll: false,  // 默认不全选
-      infoshow: false
-    }
-  },
-  props: ['f_filialeid','isshowless'],
-  ready () {
-    this.search()
-  },
-  watch:{
-    // 'selPos'(val){
-    //   console.log(val)
-    // },
-    'isSelAll'(val){
-      console.log('-------', val)
-      if (val) {
-        // 对当前页面全选
-        this.selPos = []
-        for (const sel of this.model.rows) {
-          //  if (this.selPos.indexOf(sel.id) < 0){
-          this.selPos.push(sel)
-          // }
-        }
-      } else {
-        // 取消全选
-        this.selPos = []
-      }
-    }
-  },
-  methods: {
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.depresid = obj.resids
-      this.f_orgid = obj.resids
-      this.userresid = obj.resids
-    },
-    getdep (obj, val) {
-      this.depname = val
-      // this.userresid = obj
-      this.f_depid = obj
-    },
-    getuser (obj, val) {
-      this.operatorname = val
-      this.f_operatorid = obj
-    },
-    infoclose(){
-      this.infoshow=false
-    },
-    // 批量操作
-    async batchRoot(val) {
-      let arrs = []
-      let alertMessage = ''
-      let selPos = this.selPos
-      if (val === '0') {
-        alertMessage = '停用'
-        for (const tmp of selPos) {
-          if (tmp.f_state === '正常') arrs.push(tmp)
-        }
-      } else if (val === '1') {
-        alertMessage = '启用'
-        for (const tmp of selPos) {
-          if (tmp.f_state === '停用') arrs.push(tmp)
-        }
-      } else if (val === '2') {
-        alertMessage = '升级'
-        for (const tmp of selPos) {
-          if (tmp.f_state === '正常') arrs.push(tmp)
-        }
-      } else {
-        this.showAlert('出现异常，请重新进操作')
-        return
-      }
-      await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
-        rejectMsg: null,
-        resolveMsg: null
-      })
-      // 需要提示
-      this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`,'success', 2500)
-      this.$dispatch('close')
-    },
-    abcd (row) {
-      console.log("chakan",row)
-      let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
-      this.model2.search(condition)
-      this.infoshow = true
-    },
-    search () {
-      console.log("111111111111111111111111111111111111")
-      this.$refs.paged.$refs.cri.search()
-    },
-    selfSearch (args) {
-      console.log(args)
-      if (args.model.f_user_operatorid && args.model.f_user_operator){
-        args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
-           and f_user_operator = '${args.model.f_user_operator}'`
-      }
-
-      if (args.model.f_user_operatorid && args.model.f_user_operator) {
-        args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
-                     and f_user_operator = '${args.model.f_user_operator}'`;
-      }
-
-      // 添加设备类型和状态条件
-      args.condition = `${args.condition} and f_equipment_type = 'POS' and f_state != '已删除'`;
-      // 添加公司、部门、员工条件
-      if (this.f_orgid && this.f_orgid.length > 0) {
-        args.condition += ` and f_orgid = '${this.f_orgid}'`;
-      }
-
-      if (this.f_depid && this.f_depid.length > 0) {
-        args.condition += ` and f_depid = '${this.f_depid}'`; // 或者使用合适的条件处理
-      }
-
-      if (this.f_operatorid && this.f_operatorid.length > 0) {
-        args.condition += ` and f_operatorid = '${this.f_operatorid}'`; // 或者使用合适的条件处理
-      }
-      this.model.search(args.condition, this.model)
-      this.$dispatch('research')
-    },
-
-    add () {
-      this.infoadd = false
-      // if (this.f_filialeid) {
-      this.$dispatch('add', this.f_filialeid)
-      // } else {
-      //   this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-      // }
-    },
-    del(row) {
-      console.log('要删除了', row)
-      row.f_state = '已删除'
-      this.$resetpost('rs/entity/t_equipment', row, {
-        warnMsg: '确定要删除这条信息吗？',
-        resolveMsg: '删除成功',
-        rejectMsg: '删除失败'
-      }).then((res) => {
-        this.$dispatch('refresh')
-      }).catch((error) => {
-        this.$dispatch('refresh')
-      })
-    },
-    hidden() {
-      this.criteriaShow = !this.criteriaShow
-    }
-  },
-  computed: {}
-}
-</script>

package/src/filiale/bayan/PosManage.vue

@@ -1,138 +0,0 @@
-<template>
-  <div class="flex-row">
-    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
-      <pos-list :row="row" @dblclick="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" :isshowless="isChange" v-ref:list ></pos-list>
-    </div>
-    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
-      <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
-    </div>
-
-<!--    <modal v-if="batchPos" :show.sync="batchPos" backdrop="false" >-->
-<!--      <header slot="modal-header" class="modal-header">-->
-<!--        <button type="button" class="close" @click="close"><span>&times;</span></button>-->
-<!--        <h4 class="modal-title">批量操作</h4>-->
-<!--      </header>-->
-<!--      <article slot="modal-body" class="modal-body">-->
-<!--        <form class="form-horizontal">-->
-<!--          <div class="row">-->
-<!--            <div>-->
-<!--              <h4>注意事项</h4>-->
-<!--              <p>1.如果需要对POS设备进行升级，批量选择的POS设备包含非正常状态，则只会对状态为正常的设备进行升级。</p>-->
-<!--              <p>2.如果POS设备处于停用状态，则可以进行启用操作。如果设备处于启用状态，则可以进行停用和升级操作。</p>-->
-<!--              <p>3.批量操作可能耗时较长，请刷新列表查看结果。</p>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </form>-->
-<!--      </article>-->
-<!--      <footer slot="modal-footer" class="modal-footer">-->
-<!--&lt;!&ndash;        <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>&ndash;&gt;-->
-<!--        <button type="button" class="button_search button_spacing" @click="batchRoot('1')">批量启用</button>-->
-<!--        <button type="button" class="button_search button_spacing" @click="batchRoot('0')">批量停用</button>-->
-<!--        <button type="button" class="button_clear button_spacing" @click='close'>退出</button>-->
-<!--      </footer>-->
-<!--    </modal>-->
-  </div>
-</template>
-<script>
-
-  import PosList from './PosList'
-  import PosAdd from './PosAdd'
-
-  export default {
-    title: 'POS终端管理',
-    components: {
-      PosList, PosAdd
-    },
-    data () {
-      return {
-        isChange: false,
-        row: null,
-        infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
-        batchPos: false,
-        f_filialeids: ''
-      }
-    },
-    methods: {
-      // 批量操作
-      // async batchRoot(val){
-      //   let arrs = []
-      //   let alertMessage=''
-      //   let selPos = this.$refs.list.selPos
-      //   if (val==='0'){
-      //     alertMessage='停用'
-      //     for (const tmp of selPos) {
-      //       if (tmp.f_state==='正常') arrs.push(tmp)
-      //     }
-      //   } else if (val==='1'){
-      //     alertMessage='启用'
-      //     for (const tmp of selPos) {
-      //       if (tmp.f_state==='停用') arrs.push(tmp)
-      //     }
-      //   } else if(val==='2'){
-      //     alertMessage='升级'
-      //     for (const tmp of selPos) {
-      //       if (tmp.f_state==='正常') arrs.push(tmp)
-      //     }
-      //   } else {
-      //     this.showAlert('出现异常，请重新进操作')
-      //     return
-      //   }
-      //
-      //   await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
-      //
-      //   // 需要提示
-      //   this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`)
-      //   this.isChange = false
-      //   this.close()
-      // },
-      close(){
-        this.batchPos = false
-      },
-      selected(obj, idx) {
-        console.log(obj)
-        if (!(obj instanceof MouseEvent)) {
-          this.isChange = true
-          this.infoadd = true
-          this.row = obj
-        } else {
-          this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
-        }
-      }
-    },
-    events: {
-      'search' () {
-        this.infoadd=true
-        this.isChange = false
-        this.row = null
-        this.$refs.list.$refs.paged.$refs.cri.search()
-      },
-      'research' () {
-        console.log('重新查询')
-        this.isChange = false
-        this.row = null
-      },
-      'refresh' () {
-        this.isChange = false
-        this.row = null
-        this.$refs.list.search()
-      },
-      'error' (name, row, res) {
-        this.isChange = false
-        this.row = null
-      },
-      'close' () {
-        this.isChange = false
-        this.row = null
-
-        // this.$refs.list.search()
-      },
-      'add' (val) {
-        this.f_filialeids = val
-        this.infoadd=false
-        this.row = null
-        this.isChange = true
-        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
-      }
-    }
-  }
-</script>

package/src/filiale/bayan/system.js

@@ -1,6 +0,0 @@
-// 分公司特殊组件页面注册
-
-
-exports.specialComp =  {
-  'pos-manage': (resolve) => { require(['./PosManage'], resolve) }
-}