Эх сурвалжийг харах

Merge branch 'dev_v1.0.0' of http://git.qmth.com.cn/sop/web into dev_v1.0.0

zhangjie 1 жил өмнө
parent
commit
f5986a8bd8

+ 4 - 4
src/views/sop/components/dynamic-form-item/SIGN.vue

@@ -32,9 +32,9 @@ const emit = defineEmits(['update:modelValue', 'change']);
 
 const valueData = ref('');
 const getSignResultImg = () => {
-  // getAttachmentListByKey(key.value).then((res) => {
-  //先用体验版的测试扫码链接,只能写死传'1',后期小程序发正式版本再增加支持活的参数
-  getAttachmentListByKey('1').then((res) => {
+  getAttachmentListByKey(key.value).then((res) => {
+    //先用体验版的测试扫码链接,只能写死传'1',后期小程序发正式版本再增加支持活的参数
+    // getAttachmentListByKey('1').then((res) => {
     if (Array.isArray(res)) {
       if (res && res[0]?.url) {
         valueData.value = res[0].url;
@@ -81,7 +81,7 @@ const visibleChange = (visible) => {
 };
 const createQrcodeValue = computed(() => {
   //先用体验版的测试扫码链接,只能写死,后期小程序发正式版本再增加支持活的参数
-  return 'https://sopwxapp.qmth.com.cn/sign/?key=1';
+  return 'https://sopwxapp.qmth.com.cn/sign/?key=' + this.key;
 });
 </script>
 

+ 1 - 1
src/views/sop/components/dynamic-form-item/index.vue

@@ -37,7 +37,7 @@ const emit = defineEmits(['change']);
 
 const valueData = ref(null);
 
-const bigTitles = ['FORM_GROUP_TITLE', 'ONLY_TITLE'];
+const bigTitles = ['FORM_GROUP_TITLE', 'ONLY_TITLE', 'LABEL'];
 const isBigTitle = computed(() => {
   return bigTitles.includes(props.config.code);
 });