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

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

src/components/DetailComponent/CompanyPicker.vue

@@ -12,6 +12,17 @@
         </el-input>
         <el-button v-if="isChooseAll" @click="chooseAll">全选</el-button>
         <el-button v-else @click="cancelAll">不全选</el-button>
+<!--        <el-checkbox-group v-model="checkBtn" @change="handleChange">-->
+<!--          <el-checkbox label="全选" value="1" />-->
+<!--          <el-checkbox label="Option B" value="Value B" />-->
+<!--          <el-checkbox label="Option C" value="Value C" />-->
+<!--          <el-checkbox label="disabled" value="Value disabled" disabled />-->
+<!--          <el-checkbox-->
+<!--              label="selected and disabled"-->
+<!--              value="Value selected and disabled"-->
+<!--              disabled-->
+<!--          />-->
+<!--        </el-checkbox-group>-->
         <!-- 人员选择 -->
         <el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/>
         <el-scrollbar style="height:87%;">
@@ -75,9 +86,8 @@ const props = defineProps({
     type: Boolean
   }
 });
-const radio = ref(0);
+const checkBtn=ref(1)
 const isChooseAll = ref(true);
-const chooseId = ref(0);
 let selectItem = reactive({
   type: -1,
   value: "0"
@@ -90,8 +100,6 @@ const filterText = ref("");
 const dataList = ref([]);
 const defaultChecked = ref([]);
 const tree = ref([]);
-const isSearch = ref(false);
-const expandedKeys = ref([]);
 const defaultProps = {
   value: "value",
   label: "label",

src/components/DetailComponent/SpecialFundDetail.vue

@@ -96,6 +96,7 @@ import {downloadFile} from "@/api/project-demand";
 const changeDiagram = ref(false)
 const emit = defineEmits(['getInfo', "update:formData"])
 const form = ref()
+const router = useRouter()
 
 const props = defineProps({
   formData: {
@@ -194,6 +195,16 @@ const fileTable = reactive({
     }
   ]
 })
+const handleView=(row)=>{
+  router.push({
+    name: 'Implementation/detail',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId,
+      // step: '40'
+    }
+  })
+}
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])

src/views/expense-management/share/add.vue

@@ -125,8 +125,8 @@
       <el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
     </div>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;margin-bottom: 20px">
-        <baseTitle title="流程图"></baseTitle>
+      <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
             style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"

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

@@ -80,8 +80,8 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;margin-bottom: 20px">
-        <baseTitle title="流程图"></baseTitle>
+      <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
             style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
@@ -89,6 +89,7 @@
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
+    <div style="width: 100%;height: 30px"></div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>

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

@@ -237,8 +237,8 @@
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Summary/edit'"/>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;margin-bottom: 20px">
-        <baseTitle title="流程图"></baseTitle>
+      <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
             style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"

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

@@ -13,8 +13,8 @@
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Phase/edit'"/>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;margin-bottom: 20px">
-        <baseTitle title="流程图"></baseTitle>
+      <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
             style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"

src/views/special-fund/add.vue

@@ -27,8 +27,8 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;margin-bottom: 20px">
-        <baseTitle title="流程图"></baseTitle>
+      <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
             style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"