Merge branch '1.2.0' of http://gitlab.oytour.com/viitto/pptist into 1.2.0

src/views/SellTemplate/components/ShareForm.vue

@@ -259,13 +259,13 @@ const saveShareHandler = async ()=>{
     let errmsg=''
     if(currentType.value==1 && selectedCompnays.value.length==0)errmsg='请选择公司'
     else if(currentType.value==2 && selectedDepartment.value.length==0)errmsg='请选择部门'
-    else if(currentType.value==3 && selectedPeoples.value.length==0)errmsg='请选择人员'
+    else if(currentType.value==4 && selectedPeoples.value.length==0)errmsg='请选择人员'
     else if(selectedPermission.value.length==0)errmsg='请进行权限设定'
     if(errmsg==''){
         let ids:string = '0'
         if(currentType.value==1) ids = selectedCompnays.value.join(',')
         else if(currentType.value==2) ids = selectedDepartment.value.join(',')
-        else if(currentType.value==3) ids = selectedPeoples.value.join(',')
+        else if(currentType.value==4) ids = selectedPeoples.value.join(',')
         try {
             let response = await ConfigService.SetShareAsync({
                 ShareFileId: props.id,

src/views/SellTemplate/components/journeyAdsList.vue

@@ -101,6 +101,7 @@
     </div>
     <ShareForm
     :id="shareId"
+    :file-type="shareFileType"
     v-if="shareId > 0"
     @close="() => (shareId = 0,emit('refreshHandler'))"
   ></ShareForm>