@zscreate/zhxy-app-component 1.0.81 → 1.0.83

package/components/evan-form-item/evan-form-item.vue

@@ -426,7 +426,7 @@
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle"
-            @click.stop="selectUserByRole(widget.options.multiple)">
+            @click.stop="selectUserByRole(widget)">
         <user-select-by-role ref="userSelectByRole" @ok="handleSelectRoleUserOk"/>
         <!-- <input class="form-input" placeholder-class="form-input-placeholder" v-model="dataModelShow"
           :placeholder="widget.options.placeholder" :disabled="widget.options.disabled" /> -->
@@ -464,6 +464,39 @@
         </view>
       </view>
     </view>
+
+
+    <!-- richEditor -->
+    <view v-else-if="widget.type === 'hnkj-richEditor'" class="evan-form-item-container"
+          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+      <view class="evan-form-item-container__label"
+            :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
+        {{widget.name}}
+      </view>
+      <view class="evan-form-item-container__main" :style="mContentStyle"
+            style="width: 100%;box-sizing: border-box">
+        <rich-text v-if="widget.options.disabled" :nodes="dataModel" style="width: 100%;"></rich-text>
+        <richEditor v-else v-model="dataModel"
+                    :maxLength="widget.options.wordLimits ? widget.options.maxLength: 0" style="width: 100%;">
+        </richEditor>
+      </view>
+    </view>
+
+
+    <!-- nameSignature 签名  -->
+    <view v-if="widget.type ==='hnkj-nameSignature'" class="evan-form-item-container"
+          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+      <view class="evan-form-item-container__label"
+            :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
+        {{widget.name}}
+      </view>
+      <view class="evan-form-item-container__main" :style="mContentStyle">
+        <image v-if="nameSign" :src="imgUrl + nameSign" @error="nameSignLoadError"
+               style="width: 280rpx; height: 100rpx; "></image>
+        <view v-else>{{ dataModel }}</view>
+      </view>
+    </view>
+
     <view class="error-message" v-if="showFalse">{{ showFalseMsg }}</view>
   </view>
 </template>
@@ -480,6 +513,8 @@ import jinEdit from '../../components/jin-edit/jin-edit.vue';
 import LbPicker from '../../components/lb-picker/index.vue';
 import MyPicker from '../../components/dying318-picker/Pickers.vue';
 import UniRate from '../../components/uni-rate/uni-rate.vue';
+
+import richEditor from '../rich-editor/index.vue';
 import Pubsub from 'pubsub-js'
 import {
   computedMixin
@@ -509,7 +544,8 @@ export default {
     LbPicker,
     MyPicker,
     jinEdit,
-    uniDatetimePicker
+    uniDatetimePicker,
+    richEditor
   },
   name: 'EvanFormItem',
   props: {
@@ -579,6 +615,7 @@ export default {
   },
   data() {
     return {
+      nameSign: '',
       isClickByUser: false, //是否用户点击
       single: null,
       showFalse: false,
@@ -652,6 +689,29 @@ export default {
     uni.$off(this.widget.model);
   },
   methods: {
+    // 图片加载失败，就显示dataModel
+    nameSignLoadError() {
+      this.nameSign = ''
+    },
+    // 获取签名签章
+    getUserSign() {
+      if (this.dataModel) {
+        // 签名图片回填
+        this.nameSign = this.dataModel
+        return
+      }
+      if (this.widget.options.disabled) return
+      const userInfo = uni.getStorageSync('userinfo')
+      this.$u.get("workhall/userseal/queryById").then((res) => {
+        if (res.success) {
+          this.nameSign = res.result.userSign
+          this.dataModel = res.result.userSign || userInfo.realname
+          if (this.widget.type === 'sealSignature') {
+            this.dataModel = res.result.userSeal || ""
+          }
+        }
+      })
+    },
     //文件删除
     fileDelete(idx) {
       this.dataModel.splice(idx, 1)
@@ -678,16 +738,16 @@ export default {
         callback()
       }
       if (options.condition == '小于') {
-        if (moment(value).unix() < moment(time).unix()) {
+        if (moment(value).unix() <= moment(time).unix()) {
           callback()
         } else {
-          callback("开始时间必须小于结束时间");
+          callback("开始时间必须小于等于结束时间");
         }
       } else {
-        if (moment(value).unix() > moment(time).unix()) {
+        if (moment(value).unix() >= moment(time).unix()) {
           callback()
         } else {
-          callback("开始时间必须小于结束时间");
+          callback("开始时间必须小于等于结束时间");
         }
       }
     },
@@ -807,6 +867,7 @@ export default {
       if (this.widget.type === 'relateSub') {
         this.showLabels(this.dataModel)
       }
+      if (['nameSignature', 'sealSignature'].includes(this.widget.type)) this.getUserSign()
     },
 
     updateRadioOrCheckboxModel(arr) {
@@ -896,7 +957,10 @@ export default {
     },
     /****更新*userSelector**/
     updateUserSelectorModal() {
-      if (!this.dataModel || !Array.isArray(this.dataModel) || this.dataModel.length == 0) return;
+      if (!this.dataModel || !Array.isArray(this.dataModel) || this.dataModel.length == 0) {
+        this.dataModelShow = ""
+        return;
+      }
       var str = '';
       //是否展示详情信息
       if (this.widget.options.showfield) {
@@ -915,7 +979,10 @@ export default {
     updatedeptSelectorModal() {
       if (!this.dataModel || !(Object.prototype.toString.call(this.dataModel) === '[object Array]') || this
               .dataModel.length ==
-          0) return;
+          0) {
+        this.dataModelShow = ""
+        return;
+      }
       var str = '';
       this.dataModel.forEach(item => {
         str += ',' + item.departName;
@@ -1111,8 +1178,8 @@ export default {
       if (this.widget.options.departRelation) {
         const userInfo = uni.getStorageSync('userinfo')
         console.log("userInfo: ", userInfo)
-        departId = userInfo.departId || userInfo.depart_id
-        departName = userInfo.departName || userInfo.depart_name
+        departId = this.widget.options.departId ||  userInfo.departId || userInfo.depart_id
+        departName = this.widget.options.departName || userInfo.departName || userInfo.depart_name
       }
       uni.navigateTo({
         url: '/pages/picker/picker?departRelation=' + (this.widget.options.departRelation ? 1 : 0) + '&departId=' + departId + '&departName=' + departName + '&sign=' + PubsubSign + '&multiple=' + flag + '&roleId=' + (this
@@ -1121,10 +1188,10 @@ export default {
       });
     },
 
-    selectUserByRole() {
-      if (this.widget.options.disabled) return
+    selectUserByRole(widget) {
+      if (widget.options.disabled) return
       this.isClickByUser = true
-      this.$refs.userSelectByRole.init(this.widget, this.dataModel)
+      this.$refs.userSelectByRole.init(widget, this.dataModel)
     },
     handleSelectRoleUserOk(value) {
       this.dataModelShow = ""
@@ -1266,11 +1333,28 @@ export default {
       } else {
         this.models[this.widget.model] = v
         if (this.widget.type === 'userSelector') {
+          if (v === "") {
+            this.dataModel = []
+            this.models[this.widget.model] = []
+          }
           this.updateUserSelectorModal()
         }
         if (this.widget.type === 'deptSelector') {
           this.updatedeptSelectorModal()
         }
+        if (this.widget.type === 'codeControl') {
+          const randomNum = String(Math.random())
+          const dateStr = String(new Date().getFullYear()).slice(2)
+              + (new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0' + (new Date().getMonth() + 1))
+              + (new Date().getDate() > 9 ? new Date().getDate() : '0' + new Date().getDate())
+              + randomNum.slice(-4)
+          if (!v) {
+            v = this.widget.key = dateStr + ''
+          } else {
+            this.widget.key = v
+          }
+          this.$emit('upDateWidget', this.widget)
+        }
         this.$emit("update:models", {
           ...this.models,
           [this.widget.model]: v
@@ -1408,6 +1492,7 @@ checkbox-group label {
     overflow: hidden;
     justify-content: flex-start;
     padding-left: $uni-form-padding-left;
+    z-index: 10;
 
     .form-input {
       font-size: $uni-form-content-font-size;

package/components/evan-form-item/mixins/pubSubMixin.js

@@ -50,6 +50,7 @@ export const pubSubMixin = {
 		},
 		updateModelByScript(data, list) {
 			this.isClickByUser = data.isClickByUser;
+			this.isWx = true
 			console.log(run(data.operateValue, {
 				that: this,
 				global: globalThis,

package/components/form-container/form-container.vue

@@ -54,10 +54,52 @@
 				<template v-else-if="item.type === 'grid-lay-out'  && item.options.canView">
 					<view v-for="(colItem, colIndex) in item.columns" :key="colIndex">
 						<view v-for="(col, itemIndex) in colItem.list" :key="itemIndex">
-							<evan-form-item :isCorrect="isCorrect" :labelPosition="labelPosition" :prop="col.model"
-								:ref="String(Math.random()).split('.')[1]" :models.sync="models" :rules="rules"
-								:widget="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply">
-							</evan-form-item>
+              <template v-if="col.type == 'hnkj-verify' && item.options.canView">
+                <view class="verify">
+                  <view class="verify-step">{{col.name }}</view>
+                  <view class="verify-cot">
+                    <m-textarea
+                      :value="models[col.model].comments"
+                      show-word-limit
+                      :max-length="col.options.commentsLength"
+                      :disabled="col.model !== verifyNode" :placeholder="'请输入您的意见'"
+                      @change="val => handlerText(val, col.model)">
+                    </m-textarea>
+                  </view>
+                  <view v-if="col.model == verifyNode" class="verify-cot">
+                    <view class="verify-title">{{col.options.operation}}</view>
+                    <view style="width:200rpx;">
+                      <u-input id="suggestSelect" :border="false" type="select" :select-open="selectShow"
+                               input-align="right" v-model="suggestType" placeholder="请点击选择"
+                               @click="selectShow = true"></u-input>
+                      <u-select mode="single-column" :list="selectList" v-model="selectShow"
+                                @confirm="selectConfirm($event,col)"></u-select>
+                      <!-- <picker @change="bindPickerChange($event, item.model)" :value="pickerIndex" :range="selectDataTransForm(suggest)">
+                        <view class="uni-input">{{models[item.model].operation ? models[item.model].operation : '请选择'}}</view>
+                      </picker> -->
+                    </view>
+                  </view>
+                  <view v-if="col.model !== verifyNode" class="verify-cot">
+                    <view class="verify-title">{{col.options.operation}}</view>
+                    <view>{{models[col.model].operation}}</view>
+                  </view>
+                  <view class="verify-cot">
+                    <view class="verify-title">{{ col.options.operator }}</view>
+                    <view>{{ models[col.model].operator }}</view>
+                  </view>
+                  <view class="verify-cot">
+                    <view class="verify-title">{{ col.options.operationTime }}</view>
+                    <view>{{ models[col.model].operationTime }}</view>
+                  </view>
+                </view>
+              </template>
+              <template v-else>
+                <evan-form-item :isCorrect="isCorrect" :prop="col.model"
+                                :labelPosition="labelPosition"
+                                :ref="String(Math.random()).split('.')[1]" :models.sync="models" :rules="rules"
+                                :widget="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply">
+                </evan-form-item>
+              </template>
 						</view>
 					</view>
 				</template>
@@ -73,14 +115,38 @@
 					</view>
 				</template>
 
-				<template v-else-if="item.type == 'verify' && item.options.canView">
+				<template v-else-if="['verify', 'hnkj-verify'].includes(item.type) && item.options.canView">
+
 					<view class="verify">
 						<view class="verify-step">{{item.name }}</view>
+            <view v-if="item.options.supportMulti && (verifyLogs && verifyLogs[item.model])" >
+              <view v-for="(v_log, idx) in verifyLogsList(item.model)" :key="idx">
+                <view class="verify-cot">
+                  <textarea :value="v_log.note" disabled>
+                  </textarea>
+                </view>
+                <view  class="verify-cot">
+                  <view class="verify-title">{{item.options.operation}}</view>
+                  <view>{{v_log['shenpiYijian']}}</view>
+                </view>
+                <view  class="verify-cot">
+                  <view class="verify-title">{{item.options.operator}}</view>
+                  <view>{{v_log['realname']}}</view>
+                </view>
+                <view  class="verify-cot">
+                  <view class="verify-title">{{item.options.operationTime}}</view>
+                  <view>{{v_log['shenpiTime']}}</view>
+                </view>
+              </view>
+            </view>
 						<view class="verify-cot">
-							<textarea v-model="models[item.model].comments"
-								:disabled="item.model !== verifyNode" :placeholder="'请输入您的意见'"
-								@input="handlerText($event, item.model)">
-							</textarea>
+              <m-textarea
+                  :max-length="item.options.commentsLength"
+                  show-word-limit
+                  :value="models[item.model].comments"
+                  :disabled="item.model !== verifyNode" :placeholder="'请输入您的意见'"
+                  @change="val => handlerText(val, item.model)">
+              </m-textarea>
 						</view>
 						<view v-if="item.model == verifyNode" class="verify-cot">
 							<view class="verify-title">{{item.options.operation}}</view>
@@ -89,7 +155,7 @@
 									input-align="right" v-model="suggestType" placeholder="请点击选择"
 									@click="selectShow = true"></u-input>
 								<u-select mode="single-column" :list="selectList" v-model="selectShow"
-									@confirm="selectConfirm($event,item.model)"></u-select>
+									@confirm="selectConfirm($event,item)"></u-select>
 								<!-- <picker @change="bindPickerChange($event, item.model)" :value="pickerIndex" :range="selectDataTransForm(suggest)">
 									<view class="uni-input">{{models[item.model].operation ? models[item.model].operation : '请选择'}}</view>
 								</picker> -->
@@ -133,12 +199,13 @@
 	import Pubsub from 'pubsub-js'
   import evanFormItem from "../evan-form-item/evan-form-item";
   import evanForm from "../evan-form/evan-form";
+  import mTextarea from "../m-textarea/m-textarea";
 	export default {
 		name: 'formContainer',
-		props: ['dataObj', 'value', 'isButton', 'verifyNode', 'suggest', 'isCorrect', 'isDraft', 'formId', 'linkage', "labelPosition",
+		props: ['dataObj', 'value', 'isButton', 'verifyNode', 'verifyLogs', 'suggest', 'isCorrect', 'isDraft', 'formId', 'linkage', "labelPosition",
 			'isApply'
 		],
-		components: { evanFormItem ,evanForm },
+		components: { evanFormItem ,evanForm, mTextarea },
 		data() {
 			return {
 				timer: null,
@@ -263,6 +330,11 @@
 			// this.initPo();
 		},
 		methods: {
+      verifyLogsList(model) {
+        const list = this.verifyLogs[model]
+        if (model !== this.verifyNode && list.length >= 1) return list.slice(0, list.length - 1)
+        return list
+      },
 			//回显关联组件的操作
 			getchildren() {
 				// console.log(this.$children[0])
@@ -305,11 +377,28 @@
 				this.tableData[tableKey][tableIndex].columns.splice(key, 1, widget)
 			},
 			// 选择操作类型
-			selectConfirm(e, model) {
+			selectConfirm(e, item) {
+        const { model, options, type } = item
 				e.map((val, index) => {
 					this.models[model].operation = val.label;
 				})
 				this.suggestType = this.models[model].operation
+        if (type === 'hnkj-verify') {
+          const select = this.selectList.find(item => item.label === this.suggestType)
+          const { enableSign , enableSeal } = options
+          if (select.description === 'TIJIAO') {
+            this.$u.get('workhall/userseal/queryById').then(res => {
+              if (res.success) {
+                this.models[model].userSign = enableSign ? res.result.userSign : ''
+                this.models[model].userSeal = enableSeal ? res.result.userSeal : ''
+              }
+            })
+          } else {
+            this.models[model].userSign = ''
+            this.models[model].userSeal = ''
+          }
+        }
+
 			},
 			scrollToTop(top) {
 				const _this = this
@@ -343,8 +432,8 @@
 				this.models[model].operation = this.suggest[e.target.value].value;
 				console.log(this.models)
 			},
-			handlerText($event, model) {
-				this.models[model].comments = $event.detail.value
+			handlerText(value, model) {
+				this.models[model].comments = value
 			},
 			/***单选修改赋值***/
 			selectorOption(picked, model) {
@@ -736,7 +825,7 @@
 		justify-content: space-between;
 		align-items: center;
 
-		textarea {
+		m-textarea, .textarea-wrapper {
 			display: block;
 			width: 100%;
 			height: 120rpx;

package/components/l-file/l-file.vue

@@ -84,6 +84,7 @@
         const a = document.createElement("a")
         a.href = this.downLoadUrl + path
         a.target = '_blank'
+        a.download = name
         a.click()
         return
         //#endif

package/components/m-textarea/m-textarea.vue

@@ -0,0 +1,89 @@
+<template>
+  <view class="textarea-wrapper">
+    <textarea
+        :maxlength="maxLength"
+        v-model="modelValue"
+        :disabled="disabled"
+        :placeholder="placeholder"
+    >
+    </textarea>
+    <view v-if="showWordLimit && !disabled" class="no-print textarea-wrapper__count">
+       {{ textLength }} <text v-if="textMaxLength">/{{ textMaxLength  }}</text>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "mTextarea",
+  props: {
+    disabled: Boolean,
+    maxLength: Number,
+    value: {
+      type: String,
+      default: ""
+    },
+    placeholder: String,
+    // 是否展示字数统计
+    showWordLimit: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  data() {
+    return {
+      modelValue: this.value
+    }
+  },
+  created() {
+    this.modelValue = this.value
+  },
+  computed: {
+    // 长度控制
+    textLength() {
+      const textLength = (this.modelValue || "").length;
+      if (this.textMaxLength === 0) return ''
+      return textLength
+    },
+    textMaxLength() {
+      const maxLength = parseInt(this.maxLength || '0')
+      if (maxLength >= Number.MAX_SAFE_INTEGER) {
+        return 0
+      }
+      return maxLength
+    }
+  },
+  watch: {
+    modelValue(val) {
+      this.$emit('change', val)
+    },
+    value(val) {
+      this.modelValue = val
+    }
+  },
+}
+</script>
+
+<style  lang="scss" scoped>
+textarea {
+  height: 100%;
+  width: 100%;
+}
+.textarea-wrapper {
+  z-index: 999;
+  position: relative;
+  display: block;
+  height: 100%;
+  box-sizing: border-box;
+
+  .textarea-wrapper__count {
+    color: #808080;
+    background: #fff;
+    position: absolute;
+    font-size: 12px;
+    bottom: -12rpx;
+    right: 10rpx;
+    line-height: 12px;
+  }
+}
+</style>