system-clients 3.2.1-ycapply-1 → 3.2.2-aodeToV4

package/src/components/equipment/PosManage.vue

@@ -1,138 +1,68 @@
-<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>
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <pos-list :type="type" :row="row" @select-changed="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
+      <pos-add  :type="type" :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
+    </div>
+  </div>
+</template>
+<script>
+
+  import PosList from './PosList'
+  import PosAdd from './PosAdd'
+
+  export default {
+    title: 'POS终端管理',
+    props:['type'],
+    components: {
+      PosList, PosAdd
+    },
+    data () {
+      return {
+        isChange: false,
+        row: null,
+
+        f_filialeids: ''
+      }
+    },
+    methods: {
+      selected (obj) {
+        this.isChange = true
+        this.row = obj.val
+      }
+    },
+    events: {
+      'search' () {
+        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' () {
+        this.row = null
+        this.isChange = true
+        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+      }
+    }
+  }
+</script>

package/src/components/materialManage/materialData.vue

@@ -1,44 +1,44 @@
-<template>
-    <div><button @click="showMaterialList()" class="btn btn-success "> 显示数据字典</button>  {{isShow}}</div>
-  <!--      材料列表-->
-  <modal :show.sync="isShow" width="900px"  >
-    <header slot="modal-header" class="modal-header" style="height: 60px">
-      <button type="button" class="close" @click="showMaterialList()"><span>关闭&times;</span></button>
-      <h4 class="modal-title" align="center">材料列表</h4>
-    </header>
-    <!--材料列表-->
-    <article slot="modal-body" class="modal-body" style="height: 600px">
-      <div class="span " v-show="isShow" style="height: 560px">
-        <material-data-list ></material-data-list>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer" style="height: 70px">
-      <button  type="button" class="btn btn-info btn-ln fr" @click='showMaterialList()'>关闭</button>
-    </footer>
-  </modal>
-</template>
-
-<script>
-    export default {
-        title:'数据字典',
-        name: "materialData.vue",
-
-      data(){
-          return{
-
-            //控制modal
-            isShow : false,
-          }
-      },
-
-      methods:{
-        showMaterialList(){
-          this.isShow = !this.isShow
-        }
-      }
-    }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+    <div><button @click="showMaterialList()" class="btn btn-success "> 显示数据字典</button>  {{isShow}}</div>
+  <!--      材料列表-->
+  <modal :show.sync="isShow" width="900px"  >
+    <header slot="modal-header" class="modal-header" style="height: 60px">
+      <button type="button" class="close" @click="showMaterialList()"><span>关闭&times;</span></button>
+      <h4 class="modal-title" align="center">材料列表</h4>
+    </header>
+    <!--材料列表-->
+    <article slot="modal-body" class="modal-body" style="height: 600px">
+      <div class="span " v-show="isShow" style="height: 560px">
+        <material-data-list ></material-data-list>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="height: 70px">
+      <button  type="button" class="btn btn-info btn-ln fr" @click='showMaterialList()'>关闭</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+    export default {
+        title:'数据字典',
+        name: "materialData.vue",
+
+      data(){
+          return{
+
+            //控制modal
+            isShow : false,
+          }
+      },
+
+      methods:{
+        showMaterialList(){
+          this.isShow = !this.isShow
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>