Merge branch 'mergeBranch' into blueBranch

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -91,9 +91,13 @@ export default {
           value:this.mainData.invoiceline === 'bs' || this.mainData.invoiceline === 's' ?'专用发票':'普通发票'
         },
         {
-          label:'开票金额',
+          label:'申请开票金额',
           value:this.tool.formatAmount(this.mainData.suminvoiceamount,2)
         },
+        {
+          label:'实际开票金额',
+          value:this.tool.formatAmount(this.mainData.factamount,2)
+        },
         {
           label:'开票方式',
           value:this.mainData.byhand === 1?'手工开票':'线上开票'

src/HDrpManagement/invoiceapp/index.vue

@@ -65,6 +65,9 @@
         <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
           <span>{{tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'factamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.factamount,2)}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'redamount'">
           <span>{{tool.formatAmount(scope.data.column.data.redamount,2)}}</span>
         </div>

src/HDrpManagement/orderManage/index.vue

@@ -21,7 +21,7 @@
       <template #custom>
         <div class="mt-10">
           <p class="search__label">{{$t(`状态`)}}:</p>
-          <el-select v-model="where.status" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择状态`)" @change="change">
+          <el-select v-model="where.status2" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择状态`)" @change="change" multiple>
             <el-option :label="$t(`新建`)" value="新建"></el-option>
             <el-option :label="$t(`预提交`)" value="预提交"></el-option>
             <el-option :label="$t(`提交`)" value="提交"></el-option>
@@ -153,7 +153,7 @@ export default {
       "siteid":JSON.parse(sessionStorage.getItem('active_account')).siteid,
       where: {
         "condition":"",
-        "status" : '',
+        "status2" : '',
         "type" : '',
         "tradefield": '',
         "writeoffstatus":"",//未核销,已核销,部分核销"invoicestatus":"未开票"，//未开票,已开票,部分开票"isreturn":"，//是否退回:0,1"ischange":.".//是否变更:0,1

src/SDrpManagement/agentOrder/index.vue

@@ -16,7 +16,7 @@
       <template #custom>
         <div class="mt-10">
           <p class="search__label">{{$t('订单状态')}}:</p>
-          <el-select v-model="status" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择订单状态`)" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="status" multiple clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择订单状态`)" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status2 = status;$refs.basicLayout.listData()">
             <el-option value="新建" :label="$t(`新建`)"></el-option>
             <el-option value="预提交" :label="$t(`预提交`)"></el-option>
             <el-option value="提交" :label="$t(`提交`)"></el-option>

src/SDrpManagement/invoiceapp_saler/detail/detail.vue

@@ -123,9 +123,13 @@ export default {
               : "普通发票",
         },
         {
-          label: "开票金额",
+          label: "申请开票金额",
           value: this.tool.formatAmount(this.mainData.suminvoiceamount, 2),
         },
+        {
+          label:'实际开票金额',
+          value:this.tool.formatAmount(this.mainData.factamount,2)
+        },
         {
           label: "开票方式",
           value: this.mainData.byhand === 1 ? "手工开票" : "线上开票",

src/SDrpManagement/invoiceapp_saler/index.vue

@@ -70,6 +70,9 @@
             tool.formatAmount(scope.data.column.data.suminvoiceamount, 2)
           }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'factamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.factamount,2)}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'status'">
           <span
             :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])"

src/SDrpManagement/salerOrder/index.vue

@@ -19,13 +19,14 @@
           <p class="search__label">{{ $t("订单状态") }}:</p>
           <el-select
             v-model="status"
+            multiple
             clearable
             style="margin-right: 10px"
             size="small"
             :placeholder="$t(`请选择订单状态`)"
             @change="
               $refs.basicLayout.param.content.pageNumber = 1;
-              $refs.basicLayout.param.content.where.status = status;
+              $refs.basicLayout.param.content.where.status2 = status;
               $refs.basicLayout.listData();
             "
           >

src/SDrpManagement/sinvoiceapp/detail/detail.vue

@@ -113,9 +113,13 @@ export default {
           value: this.mainData.bank + this.mainData.bankcardno,
         },
         {
-          label: "开票金额",
+          label: "申请开票金额",
           value: this.tool.formatAmount(this.mainData.suminvoiceamount, 2),
         },
+        {
+          label:'实际开票金额',
+          value:this.tool.formatAmount(this.mainData.factamount,2)
+        },
         {
           label: "发票限额",
           value: this.mainData.quota,

src/SDrpManagement/sinvoiceapp/index.vue

@@ -67,6 +67,9 @@
             )
           }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'factamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.factamount,2)}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'redamount'">
           <span>{{
             tool.formatAmount(

src/SManagement/orderclue/components/follow.vue

@@ -61,7 +61,8 @@ export default {
          "latitude":"",//经度，可选
         "longitude":"",//纬度，可选
         "address":"",//解析地址,
-        "sat_ordercluefollowuplogid":0//传0新增
+        "sat_ordercluefollowuplogid":0,//传0新增
+        "resource":"销售线索"
       },
       timer: '',
       rules: {

src/SManagement/orderclue_detail/components/editFollow.vue

@@ -83,7 +83,8 @@ export default {
         "latitude":"",//经度，可选
         "longitude":"",//纬度，可选
         "address":"",//解析地址,
-        "sat_ordercluefollowuplogid":0//传0新增
+        "sat_ordercluefollowuplogid":0,//传0新增
+        "resource":"销售线索"
       },
       timer: '',
       rules: {

src/SManagement/orderclue_detail/components/followDetail.vue

@@ -13,6 +13,7 @@
             <div class="dateLine">
               <div class="div"></div>
               <span class="span margin-5">{{item.createdate}}</span>
+              <el-tag  v-if="item.resource" size="mini" style="color: #3874f6;margin-left: 10px">{{item.resource}}</el-tag>
             </div>
             <div style="display: flex;align-items: center">
               <div class="inline-16">

src/api/request.js

@@ -32,7 +32,7 @@ const service = axios.create({
     // 公共接口--这里注意后面会讲
     baseURL:process.env.NODE_ENV === 'production' ? GET_API_URL():'/apis',
     // 超时时间 单位是ms，这里设置了3s的超时时间
-    timeout: 20 * 1000
+    timeout: 60 * 1000
 })
 let loadingInstance = ''
 // 2.请求拦截器

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

@@ -16,6 +16,12 @@
           prop="createby"
           label="跟进人"
           min-width="60">
+        <template slot-scope="scope">
+          <div>
+            {{scope.row.createby}}
+            <el-tag v-if="scope.row.resource" size="mini" style="color: #3874f6">{{scope.row.resource}}</el-tag>
+          </div>
+        </template>
       </el-table-column>
       <el-table-column
           prop="createdate"

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

@@ -129,8 +129,10 @@ export default {
     submitLog () {
       this.$refs.form.validate(async (valid)=>{
         if (!valid) return false
+        let resource = ''
         if (this.$route.path == '/phonebookDetail'){
           this.form.dataextend.contactsid = [this.$route.query.id]
+          resource = '通讯录'
         }
         const res = await this.$api.requested({
           "id": 20220930121601,
@@ -145,7 +147,8 @@ export default {
             "nextplan":this.form.nextplan,//下次跟进计划
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
-            }
+            },
+            "resource":resource
           }
         })
         this.tool.showMessage(res,()=>{

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

@@ -125,8 +125,10 @@ export default {
      submitLog () {
       this.$refs.form.validate(async(valid)=>{
         if (!valid) return false
+        let resource = ''
         if (this.$route.path == '/phonebookDetail'){
           this.form.dataextend.contactsid = [this.$route.query.id]
+          resource = '通讯录'
         }
         const res = await this.$api.requested({
           "id": 20220930121601,
@@ -141,7 +143,8 @@ export default {
             "nextplan":this.form.nextplan,//下次跟进计划
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
-            }
+            },
+            "resource":resource
           }
         })
         this.tool.showMessage(res,()=>{

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

@@ -20,9 +20,12 @@
       </div>
       <el-timeline v-else>
         <el-card v-for="i in logList" :key="i.index" shadow="hover" class="card-style">
-          <div class="dateLine">
-            <div class="div"></div>
-            <span class="span margin-5">{{i.createdate}}</span>
+          <div style="display: flex;justify-content: space-between">
+            <div class="dateLine">
+              <div class="div"></div>
+              <span class="span margin-5">{{i.createdate}}</span>
+            </div>
+            <el-tag v-if="i.resource" size="mini" style="color: #3874f6;float: right;margin: 10px 10px 0 10px;">{{i.resource}}</el-tag>
           </div>
           <div slot="dot" class="dot"></div>
           <div class="step__panel normal-margin" style="padding: 0 10px 0 10px">

src/components/normal-basic-layout/details/modules/followTable/index.vue

@@ -16,6 +16,12 @@
           prop="createby"
           label="跟进人"
           min-width="60">
+        <template slot-scope="scope">
+          <div>
+            {{scope.row.createby}}
+            <el-tag v-if="scope.row.resource" size="mini" style="color: #3874f6">{{scope.row.resource}}</el-tag>
+          </div>
+        </template>
       </el-table-column>
       <el-table-column
           prop="createdate"

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

@@ -129,6 +129,7 @@ export default {
     submitLog () {
       this.$refs.form.validate(async (valid)=>{
         if (!valid) return false
+        let resource = this.$route.matched[1].meta.title
         const res = await this.$api.requested({
           "id": 20220930121601,
           "content": {
@@ -142,7 +143,8 @@ export default {
             "nextplan":this.form.nextplan,//下次跟进计划
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
-            }
+            },
+            "resource":resource
           }
         })
         this.tool.showMessage(res,()=>{

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

@@ -125,6 +125,7 @@ export default {
      submitLog () {
       this.$refs.form.validate(async(valid)=>{
         if (!valid) return false
+        let resource = this.$route.matched[1].meta.title
         const res = await this.$api.requested({
           "id": 20220930121601,
           "content": {
@@ -138,7 +139,8 @@ export default {
             "nextplan":this.form.nextplan,//下次跟进计划
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
-            }
+            },
+            "resource":resource
           }
         })
         this.tool.showMessage(res,()=>{

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

@@ -21,9 +21,12 @@
       </div>
       <el-timeline v-else>
         <el-card v-for="i in logList" :key="i.index" shadow="hover" class="card-style">
-          <div class="dateLine">
-            <div class="div"></div>
-            <span class="span margin-5">{{i.createdate}}</span>
+          <div style="display: flex;justify-content: space-between">
+            <div class="dateLine">
+              <div class="div"></div>
+              <span class="span margin-5">{{i.createdate}}</span>
+            </div>
+            <el-tag v-if="i.resource" size="mini" style="color: #3874f6;float: right;margin: 10px 10px 0 10px;">{{i.resource}}</el-tag>
           </div>
           <div slot="dot" class="dot"></div>
           <div class="step__panel normal-margin" style="padding: 0 10px 0 10px">

src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -16,8 +16,8 @@
       <followTable :ownertable="ownertable" :disabled="disabled" @newFollow="newFollow" ref="followRef"></followTable>
     </div>
     <div v-show="activeName === 'file'">
-      <attachmentList v-if="activeName === 'file'" :disabled="disabled" :status="status" :attachmentDisabled="attachmentDisabled"  :attinfos="attinfo_attachment" @onSuccess="queryAttments" @cancelEdit="queryAttments">
-        <upload slot="upload" :folderid="folderid" :status="status" :attachmentDisabled="attachmentDisabled" :disabled="disabled"
+      <attachmentList v-if="activeName === 'file'" :disabled="$route.path == '/contractDetail'?false:disabled" :status="status" :attachmentDisabled="$route.path == '/contractDetail'?false:attachmentDisabled"  :attinfos="attinfo_attachment" @onSuccess="queryAttments" @cancelEdit="queryAttments">
+        <upload slot="upload" :folderid="folderid" :status="status" :attachmentDisabled="$route.path == '/contractDetail'?false:attachmentDisabled" :disabled="$route.path == '/contractDetail'?false:disabled"
           :bindData="{ ownertable: ownertable, ownerid: editData[idname], usetype: 'default' }"
           @onSuccess="queryAttments" :hidemediastock="hidemediastock"></upload>
       </attachmentList>

src/router/SDrpManagement.js

@@ -108,7 +108,7 @@ const SDrpManagement = [
     path: '/salerPrivatecustomer',
     name: 'salerPrivatecustomer',
     meta: {
-      title: '客户',
+      title: '我的客户',
       ast_nav:true,
       keeproute: true
     },