Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/invoiceapp/modules/edit.vue

@@ -142,7 +142,7 @@ export default {
         "invoicepayee":"",
         "invoiceclerk":"",
         "invoicechecker":"",
-        "agententerprisename":"",
+        "agententerprisename":'',
         "enterprisename":"",
         "taxno":"",
         "address":"",
@@ -207,6 +207,7 @@ export default {
       if (res.data && res.data.length > 0) {
         this.accountAmount = res.data[0]
         this.form.invo_enterprisename = this.accountAmount.enterprisename
+
         this.form.taxno = this.accountAmount.taxno
         this.form.address = this.accountAmount.address
         this.form.phonenumber = this.accountAmount.phonenumber
@@ -219,7 +220,6 @@ export default {
     // 选择开票信息
     selectTaxRow (row) {
       this.visible1 = false
-      console.log(row,'row2222')
       this.form.sys_enterpriseid = 0
       this.form.invo_enterprisename = row.enterprisename
       this.form.enterprisename = row.enterprisename

src/HDrpManagement/projectData/components/selectProject.vue

@@ -4,7 +4,7 @@
       <div class="normal-margin">
         <slot name="operation"></slot>
         <div class="mt-10 inline-16">
-          <el-input size="small" style="width:200px" clearable suffix-icon="el-icon-search" v-model="params.content.where.condition" :placeholder="`${$t(`项目名称`)},${$t(`编号`)}`" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
+          <el-input size="small" style="width:200px" clearable suffix-icon="el-icon-search" v-model="params.content.where.condition" :placeholder="`${$t(`项目名称`)},${$t(`编号`)}`" @keyup.enter.native="$refs.table.listData(params.content.pageNumber = 1)" @clear="$refs.table.listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
         </div>
         <div class="mt-10 inline-16">
           <label  class="search__label">{{$t(`项目类型`)}}:</label>
@@ -12,7 +12,7 @@
             <el-option
                 v-for="item in projectType"
                 :key="item.value"
-                :label="$t(item.value)"
+                :label="$t(item.value) + '-' + $t(item.remarks)"
                 :value="item.value">
               <span style="float: left">{{ $t(item.value) }}</span>
               <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
@@ -95,7 +95,7 @@
   import pageTable from './pageTable.vue'
 
   export default {
-    props:['projectType','projectLead','tradefieldSelect'],
+    props:['projectType','projectLead','tradefieldSelect','grade','projecttype','tradefield'],
     data () {
       return {
         params:{
@@ -125,10 +125,23 @@
     },
     methods:{
       selectRow (data) {
+        this.params.content.where.condition = ''
         this.$emit('selectRow',data)
         this.visible = false
       }
     },
+    watch:{
+      "visible":function (val){
+        if (val){
+          this.params.content.where.projecttype = this.projecttype
+          this.params.content.where.grade = this.grade
+          this.params.content.where.tradefield = this.tradefield
+          this.$refs.table.listData(this.params.content.pageNumber = 1)
+        }else {
+          this.params.content.where.condition = ''
+        }
+      }
+    }
   }
 
   </script>

src/HDrpManagement/projectData/index.vue

@@ -1663,11 +1663,11 @@
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label">{{ $t('项目类型') }}:</label>
-                    <el-select v-model="dateParam.content.where.projecttype" placeholder="请选择项目类型" @change="getDate" size="small" clearable>
+                    <el-select v-model="dateParam.content.where.projecttype" :placeholder="$t(`请选择项目类型`)" @change="getDate" size="small" clearable>
                       <el-option
                           v-for="item in projectType"
                           :key="item.value"
-                          :label="$t(item.value)"
+                          :label="$t(item.value) + '-' + $t(item.remarks)"
                           :value="item.value">
                         <span style="float: left">{{ $t(item.value) }}</span>
                         <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
@@ -1675,8 +1675,8 @@
                     </el-select>
                   </div>
                   <div class="mt-10 inline-16">
-                    <label  class="search__label">项目等级:</label>
-                    <el-select v-model="dateParam.content.where.grade" placeholder="请选择项目等级" @change="getDate" size="small" clearable>
+                    <label  class="search__label">{{$t(`项目等级`)}}:</label>
+                    <el-select v-model="dateParam.content.where.grade" :placeholder="$t(`请选择项目等级`)" @change="getDate" size="small" clearable>
                       <el-option
                           v-for="item in projectLead"
                           :key="item.value"
@@ -1703,7 +1703,7 @@
               </div>
               <div class="mt-10 inline-16" style="margin-top:10px">
                 <label  class="search__label" >{{$t(`项目名称`)}}:</label>
-                <selectProject :projectType="projectType" :projectLead="projectLead" :tradefieldSelect="tradefieldSelect"  @selectRow="selectRow" ref="selectProject">
+                <selectProject :projectType="projectType" :projectLead="projectLead" :tradefieldSelect="tradefieldSelect" :grade="dateParam.content.where.grade" :projecttype="dateParam.content.where.projecttype" :tradefield="dateParam.content.where.tradefield" @selectRow="selectRow" ref="selectProject">
                   <div slot="input" style="display:flex;align-items:center">
                     <el-input v-model="projectname" style="width:300px" size="small" :placeholder="$t(`请选择项目`)" @focus="$refs.selectProject.visible=true"></el-input>
                     <el-button style="margin-left:10px" @click="clearSelect" size="mini" type="text" v-if="dateParam.content.where.sa_projectid">{{$t('清空')}}</el-button>

src/components/normal-basic-layout-new/details/modules/followUp/followUp.vue

@@ -91,7 +91,13 @@
           <div style="padding: 0 10px 10px 10px">
             <div class="flex-align-center flex-between pionter" v-for="img in i.attinfos" :key="img.index" style="padding:10px;margin-bottom:5px;border: 1px solid #ccc">
               <div class="flex-align-center" style="flex:1;width:100%;">
-                <img width="30" :src="checkFileType(img.postfix) === 'file'?require('@/assets/file_icons/file.svg'):img.url" class="inline-16" alt="">
+                <previewImage
+                    v-if="img.postfix == 'jpg' || img.postfix == 'JPG' || img.postfix == 'jpge' || img.postfix == 'JPGE' || img.postfix == 'pnd' || img.postfix == 'PND' || img.postfix == 'svg' || img.postfix == 'SVG'"
+                    style="width:50px;height:50px;margin:0px"
+                    :image="img"
+                    :deletebtn="false"
+                ></previewImage>
+                <img v-else width="30" :src="checkFileType(img.postfix) === 'file'?require('@/assets/file_icons/file.svg'):img.url" class="inline-16" alt="">
                 <div class="file__link">
                   <a :href="img.url">{{img.document}}</a>
                   <p>{{(img.contentlength / 1024).toFixed(2)}}kb</p>

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -92,7 +92,13 @@
           <div style="padding: 0 10px 10px 10px">
             <div class="flex-align-center flex-between pionter" v-for="img in i.attinfos" :key="img.index" style="padding:10px;margin-bottom:5px;border: 1px solid #ccc">
               <div class="flex-align-center" style="flex:1;width:90%;">
-                <img width="30" :src="checkFileType(img.postfix) === 'file'?require('@/assets/file_icons/file.svg'):img.url" class="inline-16" alt="">
+                <previewImage
+                    v-if="img.postfix == 'jpg' || img.postfix == 'JPG' || img.postfix == 'jpge' || img.postfix == 'JPGE' || img.postfix == 'pnd' || img.postfix == 'PND' || img.postfix == 'svg' || img.postfix == 'SVG'"
+                    style="width:50px;height:50px;margin:0px"
+                    :image="img"
+                    :deletebtn="false"
+                ></previewImage>
+                <img v-else width="30" :src="checkFileType(img.postfix) === 'file'?require('@/assets/file_icons/file.svg'):img.url" class="inline-16" alt="">
                 <div class="file__link">
                   <a :href="img.url">{{img.document}}</a>
                   <p>{{(img.contentlength / 1024).toFixed(2)}}kb</p>