@zscreate/zhxy-app-component 1.0.257 → 1.0.259

package/components/picker/picker.vue

@@ -4,15 +4,15 @@
     <custom-top :isBack="true">
       <block slot="backText"></block>
     </custom-top>
-    <common_component v-if="name" :name="name"  @ok="handleOk" />
+    <WorkFlowApp v-if="name === 'workflowApp'"  @ok="handleOk"  @cancel="handleCancel" />
   </view>
 </template>
 <script>
-import common_component from "./common_component.vue";
+import WorkFlowApp from "../workFlowApp/workFlowApp.vue";
 
 export default {
   components: {
-    common_component
+    WorkFlowApp,
   },
   name: "common",
   data() {
@@ -29,6 +29,11 @@ export default {
 
   },
   methods: {
+    handleCancel() {
+      uni.navigateBack({ //uni.navigateTo跳转的返回，默认1为返回上一级
+        delta: 1
+      })
+    },
     handleOk(data) {
       let pages = getCurrentPages(); //获取所有页面栈实例列表
       let nowPage = pages[pages.length - 1]; //当前页页面实例

package/components/workFlowApp/workFlowApp.vue

@@ -1,6 +1,6 @@
 <template>
-  <view style="height: 100%; padding: 0 10rpx">
-    <view style="padding: 10rpx 0 ;display: flex">
+  <view style="height: 100%; padding: 0 10rpx; display: flex; flex-direction: column">
+    <view style="padding: 10rpx 0 ;display: flex; flex-shrink: 0">
       <view>
         <u-button  size="mini" :ripple="true" ripple-bg-color="#4480E3" @click="isFilterShow = true">
           <u-icon name="search" color="#2979ff" size="28"></u-icon> 查询
@@ -15,7 +15,7 @@
     <u-popup v-model="isFilterShow" mode="bottom" z-index="200">
       <view class="filter_wrap" style="padding: 20rpx">
         <u-form :model="searchForm" ref="uForm">
-          <u-form-item label="姓名"><u-input v-model="searchForm.user_name" /></u-form-item>
+          <u-form-item label="申请人"><u-input v-model="searchForm.user_name" /></u-form-item>
           <u-form-item label="状态">
               <u-input v-model="searchForm.business_status_str" type="select" @click="statusShow = true" />
           </u-form-item>
@@ -26,7 +26,7 @@
       </view>
     </u-popup>
     <u-picker  mode="selector" v-model="statusShow" :range="statusRange" @confirm="selectStatus" range-key="label" />
-      <view style="overflow: auto; height: calc(100vh - 340rpx)">
+      <view style="flex-shrink: 0; overflow: auto; flex: 1">
         <view class="grid-container" >
           <view v-for="(h, n) in header" :key='n' :class="{ 'grid-item': true }">
             <template v-if="h.columnName === '#'">
@@ -42,9 +42,13 @@
             <template v-for="(h, n) in header" >
               <view class="grid-item grid-item_data"  >
                 <template v-if="h.columnCode === 'check'">
-                  <u-checkbox-group @change="e => checkboxChange(e, t)">
-                     <u-checkbox class="custom_checkbox"  v-model="t.checked" :name="t.id"></u-checkbox>
-                  </u-checkbox-group>
+                  <u-radio-group :value="seletedData.map(item => item.id)" @change="e => radioChange(e, t)">
+                     <u-radio class="custom_checkbox"  :name="t.id"></u-radio>
+                  </u-radio-group>
+
+<!--                  <u-checkbox-group  @change="e => checkboxChange(e, t)">-->
+<!--                    <u-checkbox class="custom_checkbox" v-model="t.checked" :name="t.id"></u-checkbox>-->
+<!--                  </u-checkbox-group>-->
                 </template>
                 <template v-else-if="h.columnCode === 'action'">
                   <button class="uni-button" size="mini" type="primary" @click="selectItem(t)">选择</button>
@@ -83,7 +87,7 @@
 
       <view style="display: flex; justify-content: center;  padding: 10rpx" >
         <button class="uni-button" size="mini" type="primary" @click="handleOk">确认</button>
-        <button class="uni-button" size="mini" type="primary" style="background-color: red" @click="show = false">取消</button>
+        <button class="uni-button" size="mini" type="primary" style="background-color: red" @click="handleCancel">取消</button>
       </view>
   </view>
 </template>
@@ -240,6 +244,13 @@ export default {
     handleOk() {
       return this.$emit('ok', this.seletedData)
     },
+    handleCancel() {
+      return this.$emit('cancel')
+    },
+    // 单选
+    radioChange(e, t) {
+      this.seletedData = [t]
+    },
     // 单选
     checkboxChange(e, t) {
       const isCheck = Boolean(Array.isArray(e) ? e[0] : e)
@@ -289,7 +300,7 @@ export default {
 <style lang="less">
 .custom_checkbox {
   display: initial;
-  .u-checkbox__label {
+  .u-checkbox__label, .u-radio__label {
     display: none !important;
   }
   .u-icon {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.257",
+	"version": "1.0.259",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",

package/components/picker/commonComponent.vue

@@ -1,51 +0,0 @@
-
-<template>
-  <view >
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-    123
-<!--    <WorkFlowApp v-if="name === 'workflowApp'"  @ok="handleOk"  />-->
-  </view>
-</template>
-
-<script>
-// import WorkFlowApp from "../workFlowApp/workFlowApp.vue";
-
-export default {
-  name: "commonComponent",
-  // components: {WorkFlowApp},
-  props: {
-    name: String,
-  },
-  created() {
-    console.log(this.name)
-  },
-  methods: {
-    handleOk(...args) {
-      this.$emit('ok', ...args)
-    }
-  }
-}
-</script>
-
-
-<style scoped lang="scss">
-
-</style>

package/components/picker/common_component.vue

@@ -1,31 +0,0 @@
-
-<template>
-  <view style="width: 100%; height: 100%">
-    <WorkFlowApp v-if="name === 'workflowApp'"  @ok="handleOk"  />
-  </view>
-</template>
-
-<script>
-import WorkFlowApp from "../workFlowApp/workFlowApp.vue";
-
-export default {
-  name: "commonComponent",
-  components: {WorkFlowApp},
-  props: {
-    name: String,
-  },
-  created() {
-    console.log(this.name)
-  },
-  methods: {
-    handleOk(...args) {
-      this.$emit('ok', ...args)
-    }
-  }
-}
-</script>
-
-
-<style scoped lang="scss">
-
-</style>

package/components/picker/component.vue

@@ -1,29 +0,0 @@
-<script>
-import WorkFlowApp from "../workFlowApp/workFlowApp.vue";
-
-export default {
-  name: "commonComponent",
-  components: {WorkFlowApp},
-  props: {
-    name: String,
-  },
-  created() {
-    debugger
-  },
-  methods: {
-    handleOk(...args) {
-      this.$emit('ok', ...args)
-    }
-  }
-}
-</script>
-
-<template>
-  <view style="width: 100%; height: 100%">
-      <WorkFlowApp v-if="name === 'workflowApp'"  @ok="handleOk"  />
-  </view>
-</template>
-
-<style scoped lang="scss">
-
-</style>