Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/contractManage/index.vue

@@ -111,6 +111,9 @@
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'enterprisename2'">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
         <div  v-else-if="scope.data.column.columnname == 'discountrate'">
 <!--          <div v-if="scope.data.column.data"></div>-->
 <!--          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}-->
@@ -133,6 +136,9 @@
           </div>
           <div v-else>--</div>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'rate'">
+          {{scope.data.column.data[[scope.data.column.columnname]] < 1?Math.round((scope.data.column.data[[scope.data.column.columnname]] * 100)*100)/100:100}}
+        </div>
         <div v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
         </div>

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -232,7 +232,7 @@
               [
                 {title:'合同总数',value:$refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].allQty,bg:'#F3F9FC',color:'#3874F6'},
                 {title:'合同金额',value:unitCompile($refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].sumSignAmount || '0'),bg:'#E8F7EC',color:'#78B32B'},
-                {title:'进行中合同总数',value:unitCompile($refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].inProgressQty || '0'),bg:'#FDF3F3',color:'#E85B5B'},
+                {title:'进行中合同总数',value:$refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].inProgressQty || '0',bg:'#FDF3F3',color:'#E85B5B'},
                 {title:'进行中合同金额',value:unitCompile($refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].inProgressAmount || '0'),bg:'#F9F2E5',color:'#FF7603'},
                 {title:'到期合同数',value:$refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].expireQty,bg:'#F3F9FC',color:'#3874F6'},
                 {title:'到期合同金额',value:unitCompile($refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].expireAmount || '0'),bg:'#E8F7EC',color:'#78B32B'},

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -4,7 +4,11 @@
       <div class="flex-align-center">
         <slot name="operation"></slot>
         <addProduct style="margin:0 0 10px 10px" v-if="type !== 'confirmdate' && data.status === '新建' " :drawer="drawer" :data="data"  ref="addProduct"
-                    :params="paramsAdd" :tablecolsAdd="tablecolsAdd" :title="$t(`添 加`)" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
+                    :params="paramsAdd" :tablecolsAdd="tablecolsAdd" :title="data.type == '项目订单'?$t(`自项目合同添加`):$t(`添 加`)" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
+                    @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="listData();$emit('onSuccess')"
+        ></addProduct>
+        <addProduct style="margin:0 0 10px 10px" v-if="type !== 'confirmdate' && data.status === '新建' && data.type == '项目订单' && tool.checkAuth($route.name, 'productProfileAdd')"  :drawer="drawer" :data="data"  ref="addProduct"
+                    :params="paramsAdd" :tablecolsAdd="tablecolsAdd" :title="$t(`自产品档案添加`)" newTitle="产品档案" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
                     @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="listData();$emit('onSuccess')"
         ></addProduct>
          <uploadAllData

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -16,7 +16,7 @@
           ref="addProduct"
           :params="paramsAdd"
           :tablecolsAdd="tablecolsAdd"
-          :title="$t(`添 加`)"
+          :title="data.type == '项目订单'?$t(`自项目合同添加`):$t(`添 加`)"
           :tradefield="data.tradefield"
           :querySa_brandid="data.sa_brandid"
           @addSuccess="addProducts"
@@ -27,6 +27,32 @@
             $emit('onSuccess');
           "
         ></addProduct>
+        <addProduct
+            class="inline-16"
+            v-if="
+            type !== 'confirmdate' &&
+            data.status === '新建' &&
+            data.type !== '特殊订单'
+            && data.type == '项目订单'
+            && tool.checkAuth($route.name, 'productProfileAdd')
+          "
+            :drawer="drawer"
+            :data="data"
+            ref="addProduct"
+            :params="paramsAdd"
+            :tablecolsAdd="tablecolsAdd"
+            :title="$t(`自产品档案添加`)"
+            newTitle="产品档案"
+            :tradefield="data.tradefield"
+            :querySa_brandid="data.sa_brandid"
+            @addSuccess="addProducts"
+            @addProduct="addProduct"
+            @uploadData="uploadData"
+            @closeDrawer="
+            listData();
+            $emit('onSuccess');
+          "
+        ></addProduct>
         <!--      <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>-->
         <uploadAllData
           v-if="

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -16,7 +16,7 @@
           ref="addProduct"
           :params="paramsAdd"
           :tablecolsAdd="tablecolsAdd"
-          :title="$t(`添 加`)"
+          :title="data.type == '项目订单'?$t(`自项目合同添加`):$t(`添 加`)"
           :tradefield="data.tradefield"
           :querySa_brandid="data.sa_brandid"
           @addSuccess="addProducts"
@@ -27,6 +27,32 @@
             $emit('onSuccess');
           "
         ></addProduct>
+        <addProduct
+            class="inline-16"
+            v-if="
+            type !== 'confirmdate' &&
+            data.status === '新建' &&
+            data.type !== '特殊订单'
+            && data.type == '项目订单'
+            && tool.checkAuth($route.name, 'productProfileAdd')
+          "
+            :drawer="drawer"
+            :data="data"
+            ref="addProduct"
+            :params="paramsAdd"
+            :tablecolsAdd="tablecolsAdd"
+            :title="$t(`自产品档案添加`)"
+            newTitle="产品档案"
+            :tradefield="data.tradefield"
+            :querySa_brandid="data.sa_brandid"
+            @addSuccess="addProducts"
+            @addProduct="addProduct"
+            @uploadData="uploadData"
+            @closeDrawer="
+            listData();
+            $emit('onSuccess');
+          "
+        ></addProduct>
         <!--      <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>-->
         <uploadAllData
           v-if="

src/template/addProduct/index1.vue

@@ -227,6 +227,7 @@ export default {
     "sa_projectid",
     "querySa_brandid",
     "typeName",
+    "newTitle"
   ],
   components: { tableTemp, uploadAllData, previewImage },
   data() {
@@ -272,7 +273,7 @@ export default {
             this.params.id = 20221109153502;
             break;
           case "项目订单":
-            this.params.id = 20230103155002;
+            this.params.id = this.newTitle == '产品档案'?2025031913184903:20230103155002;
             break;
           case "促销订单":
             this.params.id = 20230107182302;