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

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

src/components/DetailComponent/ProjectAttachment.vue

@@ -161,6 +161,10 @@ const handleUpload = () => {
 }
 handleSearch()
 getTagsOption()
+onActivated(()=>{
+  handleSearch()
+  getTagsOption()
+})
 </script>
 <style lang="scss">
 .execute-apply-table {

src/components/DetailComponent/SummaryDetail.vue

@@ -70,7 +70,7 @@
 <!--      </el-row>-->
 <!--/*      <baseTitle title="附件文件" style="margin-bottom: 0"></baseTitle>*/-->
       <el-row gutter="20" style="margin-bottom: -18px;">
-        <el-col :span="24">
+        <el-col :span="24" class="file-table-style">
           <file-component tag="需求上报"
                           v-model:value="localFormData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
@@ -322,19 +322,22 @@ getFundOptions()
   overflow-y: auto;
   padding-bottom: 0 !important;
 }
-:deep(.el-table__header) {
+.file-table-style{
-  .is-leaf:first-child {
+  :deep(.el-table__header) {
-    .cell {
+    .is-leaf:first-child {
-      margin-left: -25px !important;
+      .cell {
+        margin-left: -25px !important;
+      }
+    }
+  }
+
+  :deep(.el-table__body) {
+    .el-table__cell:first-child {
+      .cell {
+        margin-left: -13px !important;
+      }
     }
   }
 }
 
-:deep(.el-table__body) {
-  .el-table__cell:first-child {
-    .cell {
-      margin-left: -13px !important;
-    }
-  }
-}
 </style>

src/components/steps/index.vue

@@ -347,7 +347,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{ toThousands(baseFormData.value?.specialFundAmount )}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

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

@@ -55,6 +55,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6"  v-if="formData.isSpecialFund">
+<!--          <el-form-item>-->
+            <a  @click="addSpecialFund" style="width: 116px;text-align: right;display: inline-block">新增专项资金</a>
+<!--          </el-form-item>-->
+        </el-col>
         <el-col :span="24">
           <el-form-item label="征集公司" :required="true" prop="" class="company-select">
             <div style="width: 100%">
@@ -245,6 +250,14 @@ const tableConfig = reactive({
   ]
 })
 localStorage.removeItem('originallyCompanySelectedList')
+
+const addSpecialFund=()=>{
+  router.push({
+    name: 'Fund/add',
+    query: {}
+  })
+}
+
 const clickToPreview = (row) => {
   filePreviewShow.value = false
   filePreviewParam.value = {

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

@@ -110,7 +110,14 @@
         </el-col>
         <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'':'-40px'}">
           <el-form-item label="经费预算(元)" prop="economicEstimate">
-            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经费预算" :controls="false"/>
+            <el-input
+                v-model="formData.economicEstimate"
+                placeholder="请输入经费预算"
+                clearable
+                :formatter="(value) => value.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+                :parser="(value) => value.replace(/\$\s?|(,*)+[^0-9.]/g, '')"
+            />
+<!--            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经费预算" :controls="false"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
@@ -167,11 +174,18 @@
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
           <el-form-item label="申请总部专项资金(元)" prop="specialFundAmount">
-            <el-input-number v-model="formData.specialFundAmount" placeholder="请输入申请总部专项资金" :controls="false"/>
+            <el-input
+                v-model="formData.specialFundAmount"
+                placeholder="请输入申请总部专项资金"
+                clearable
+                :formatter="(value) => value.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+                :parser="(value) => value.replace(/\$\s?|(,*)+[^0-9.]/g, '')"
+            />
+<!--            <el-input-number v-model="formData.specialFundAmount" placeholder="请输入申请总部专项资金" :controls="false"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':'-40px'}">
-          <el-form-item label="部门分管领导" required prop="">
+          <el-form-item label="部门分管领导" prop="">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
             </el-button>

src/views/project-management/filing/attachment.vue

@@ -219,7 +219,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{ toThousands(baseFormData.value?.specialFundAmount )}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

src/views/project-management/filing/upload.vue

@@ -227,7 +227,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{ toThousands(baseFormData.value?.specialFundAmount )}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

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

@@ -222,7 +222,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              basicData.value?.specialFundAmount ?
+                  <span>{ toThousands(basicData.value?.specialFundAmount )}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',
@@ -545,6 +554,7 @@ const search = (val) => {
 }
 onActivated(() => {
   init()
+  search()
 })
 </script>
 

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

@@ -236,7 +236,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

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

@@ -280,7 +280,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

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

@@ -223,7 +223,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

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

@@ -204,7 +204,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',
@@ -219,11 +228,11 @@ const schema = computed(() => {
 const baseForm = ref()
 const searchConfig = reactive([
   {
-    label: '项目人员',
+    label: '研发人员',
     prop: 'researchPersonnel',
     component: 'el-input',
     props: {
-      placeholder: '请输入项目人员查询'
+      placeholder: '请输入研发人员查询'
     }
   },
   {

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

@@ -19,7 +19,7 @@
       </el-form-item>
     </el-form>
 <!--    <baseTitle title="其他文件"></baseTitle>-->
-    <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
+    <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''" style="margin-left: 15px"/>
     <fvTable style="width: 100%;max-height: 318px;" v-if="showTable" height="318" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -241,7 +241,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{ toThousands(baseFormData.value?.specialFundAmount )}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

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

@@ -58,8 +58,15 @@
         <el-table-column prop="afterTax" label="税后余额(元)" min-width="220">
           <template #default="scope">
             <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
-              <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
+              <el-input
-              </el-input-number>
+                  v-model="scope.row.afterTax"
+                  placeholder="请输入税后余额"
+                  clearable
+                  :formatter="(value) => value.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+                  :parser="(value) => value.replace(/\$\s?|(,*)+[^0-9.]/g, '')"
+              />
+<!--              <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">-->
+<!--              </el-input-number>-->
             </el-form-item>
           </template>
         </el-table-column>
@@ -312,7 +319,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 6
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

src/views/project-management/mobledetail/StepsMoblie.vue

@@ -325,7 +325,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 24
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

src/views/project-management/phaseDetailMoblie/index.vue

@@ -226,7 +226,16 @@ const schema = computed(() => {
       prop: 'specialFundAmount',
       colProps: {
         span: 24
-      }
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.specialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '部门分管领导',

src/views/special-fund/add.vue

@@ -10,7 +10,14 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="金额(元)" prop="fundAmount" label-width="100">
-            <el-input-number v-model="formData.fundAmount" placeholder="请输入金额" :controls="false"/>
+            <el-input
+                v-model="formData.fundAmount"
+                placeholder="请输入金额"
+                clearable
+                :formatter="(value) => value.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+                :parser="(value) => value.replace(/\$\s?|(,*)+[^0-9.]/g, '')"
+            />
+<!--            <el-input-number v-model="formData.fundAmount" placeholder="请输入金额" :controls="false"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="24">

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog custom-class="custom-dialog" class="border" :border="false" closeFree width="1000px" style="height: 676px"
-             :title="title" :visible.sync="visible" v-model="visible" append-to-body :close-on-click-modal="false"
+             :title="title" :show-close="false"  :visible.sync="visible" v-model="visible" append-to-body :close-on-click-modal="false"
              >
     <div class="picker">
       <div class="candidate" v-loading="loading">