Merge pull request 'master' (#336) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/336

src/views/project-demand/requirement/add.vue

@@ -35,7 +35,7 @@
         <el-col :span="24">
           <el-form-item label="所属公司" prop="companyIds" class="tree-select">
             <div>{{ getName(companyList) }}</div>
-            <el-button @click="showCompany">{{companyList.length===0?'请选择':'更改'}}</el-button>
+            <el-button  color="#DED0B2" @click="showCompany">{{companyList.length===0?'请选择所属公司':'更改'}}</el-button>
 <!--                        <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
 <!--                                        filterable clearable :check-strictly="true" multiple/>-->
           </el-form-item>

src/views/project-management/implementation/components/ToolToShowUserPicker.vue

@@ -1,6 +1,7 @@
 <template>
-  <el-button color="#DED0B2"  >
+  <div>{{modelValue}}</div>
-    {{ modelValue || '请选择抄送人员' }}
+  <el-button color="#DED0B2" style="margin-left: 10px" @click="click">
+    {{ modelValue?'更改':'请选择抄送人员' }}
   </el-button>
 </template>
 
@@ -11,13 +12,8 @@ const props = defineProps({
     default: ''
   }
 })
-
+const emit = defineEmits('clickCopyUser')
-// const emit = defineEmits('update: modelValue')
+const click=()=>{
-
+  emit("clickCopyUser")
-const localText = ref('')
+}
-
 </script>
-
-<style lang="scss" scoped>
-
-</style>

src/views/project-management/implementation/phase.vue

@@ -4,7 +4,7 @@
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <el-form :model="formData" label-width="auto">
       <el-form-item label="抄送人员">
-        <Ttsup :modelValue="chooseUserInfo()" @click="chooseUser"/>
+        <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
       </el-form-item>
     </el-form>
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
@@ -130,7 +130,7 @@ const chooseUserInfo = () => {
       return item.name
     }).join('，')
   } else {
-    return "请选择抄送人员"
+    return null
   }
 }
 const selected = (select) => {

src/views/workflow/process/common/UserPicker.vue

@@ -187,7 +187,7 @@ const showUserPicker = () => {
     value: "0"
   };
   dataList.value = [];
-  selectList.value = []
+  // selectList.value = []
   chooseId.value = 0;
   radio.value = 0;
   visible.value = true;