Merge branch 'blueBranch' into testToMerge

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -45,7 +45,6 @@
           class="inline-16"
           title="自报价单添加"
           :tablecolsAdd="tablecolsAdd"
-          :tradefield="data.tradefield"
           :data="data"
           @closeDrawer="closeDrawer"
           @addSuccess="queryProuctAdds"

src/HDrpManagement/contractManage/modules/detail.vue

@@ -254,15 +254,18 @@
           <BaseInfo v-else :detailInfo="detailInfo"/>
         </div>
         <div v-if="mainData.type == '项目'">
-          <linkedOrder v-if="tool.checkAuth($route.name,'linkedOrder')"></linkedOrder>
+          <linkedOrder v-if="tool.checkAuth($route.name,'linkedOrder') && !tool.checkAuth($route.name,'brokerageFeeEntrySet')"></linkedOrder>
           <BaseInfo v-else :detailInfo="detailInfo"/>
         </div>
       </div>
       <div slot="slot4">
         <div v-if="mainData.type == '框架' || mainData.type == '直销'">
-          <linkedOrder v-if="tool.checkAuth($route.name,'linkedOrder')"></linkedOrder>
+          <linkedOrder v-if="tool.checkAuth($route.name,'linkedOrder') && !tool.checkAuth($route.name,'brokerageFeeEntrySet')"></linkedOrder>
           <BaseInfo v-else :detailInfo="detailInfo"/>
         </div>
+        <div v-if="mainData.type == '项目'">
+          <linkedOrder v-if="tool.checkAuth($route.name,'linkedOrder')"></linkedOrder>
+        </div>
       </div>
       <div slot="slot5">
         <linkedOrder></linkedOrder>
@@ -847,7 +850,7 @@ export default {
           },
           {
             label:'居间商',
-            value:this.mainData.enterprisename
+            value:this.mainData.ascription_enterprisename
           },
           {
             label:'合同',
@@ -864,7 +867,7 @@ export default {
           },
           {
             label:'客户名称',
-            value:this.mainData.ascription_enterprisename
+            value:this.mainData.enterprisename
           },
           {
             label:'合同有效期',
@@ -1400,7 +1403,7 @@ export default {
                       },
                       {
                         label:'居间商',
-                        value:this.mainData.enterprisename
+                        value:this.mainData.ascription_enterprisename
                       },
                       {
                         label:'合同',
@@ -1417,7 +1420,7 @@ export default {
                       },
                       {
                         label:'客户名称',
-                        value:this.mainData.ascription_enterprisename
+                        value:this.mainData.enterprisename
                       },
                       {
                         label:'合同有效期',

src/HDrpManagement/orderManage/index.vue

@@ -131,6 +131,9 @@
         </div>
         <div v-else-if="scope.data.column.columnname == 'defaultamount'">
           {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'goodsstatus'">
+
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?$t(scope.data.column.data[[scope.data.column.columnname]]):'--'}}

src/HDrpManagement/payvoucher/details/index.vue

@@ -124,6 +124,10 @@ export default {
           label:'确认金额',
           value:this.mainData.status === '审核'?this.tool.formatAmount(this.mainData.amount,2):'--'
         },
+        {
+          label:'负责人',
+          value:this.mainData.leader
+        },
       ]
     },
     // 监听切换数据,上一页,下一页

src/HDrpManagement/prodectFileData/modules/relation.vue

@@ -39,7 +39,7 @@ export default {
       this.selectList = data.map(item=>item.plm_technicalinfo_itemid)
     },
     onDeletes(){
-      this.$confirm(this.$t('是否确认批量删除关联商品')+'?', $t('提示'), {
+      this.$confirm(this.$t('是否确认批量删除关联商品')+'?', this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'

src/HDrpManagement/recvoucher/details/index.vue

@@ -194,6 +194,10 @@ export default {
           label:'未核销金额',
           value:this.tool.formatAmount(this.mainData.unwriteoffamount,2)
         },
+        {
+          label:'负责人',
+          value:this.mainData.leader
+        },
       ]
     },
     // 监听切换数据,上一页,下一页

src/HDrpManagement/serveBill/modules/detail.vue

@@ -16,6 +16,7 @@
         { key: 'status', value: '待指派' },
         { key: 'status', value: '已完成' },
       ]"
+      :status="mainData.status"
       tags=""
       :tabs="
         mainData.servicetype == '售前' || mainData.servicetype == '历史售后'

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -9,6 +9,7 @@
         idname="sa_serviceorderid"
         ownertable="sa_serviceorder"
         :delApiId="20230206091803"
+        :status="mainData.status"
         :statusCheck="[{key:'status',value:'待处理'},{key:'status',value:'进行中'},{key:'status',value:'提交'},{key:'status',value:'待指派'},{key:'status',value:'已完成'}]"
         tags=""
         :tabs="mainData.servicetype == '售前' || mainData.servicetype == '历史售后'?['详细信息','关联工单']:['详细信息','服务商品','关联工单']"

src/components/attachment_list/index.vue

@@ -64,7 +64,7 @@
             >{{$t(`编 辑`)}}</el-button>
             <el-popconfirm :title="$t(`确定删除当前附件吗`)+'？'" :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')" @confirm="deleteAttachment(scope.row)">
               <el-button
-                :disabled="onlyread || status === '已失败' || status === '已结案' || scope.row.usetype === 'undelete' || attachmentDisabled || disabled"
+                :disabled="onlyread || status === '已失败' || status === '已结案' || scope.row.usetype === 'undelete' || attachmentDisabled || disabled || ($route.path == '/serveBillDetail' && status != '新建') || ($route.path == '/serveBillMagDetail' && status != '新建')"
                 v-if="!onlyread && status !== '已失败' && status !== '已结案' && scope.row.usetype !== 'undelete' && !attachmentDisabled"
                 slot="reference"
                 size="small"