测试合并开发

src/components/byTable/index.vue

@@ -31,8 +31,8 @@
       </select>
       <div v-if="statConfig.length === 1">{{ statConfig[0].label }}</div>
     </div>
-    <div class="more-btn">
-      <span @click="isMore = !isMore" v-if="statWarpHeight > 200">
+    <div class="more-btn"  @click="isMore = !isMore" v-if="statWarpHeight > 200">
+      <span>
         <i v-if="!isMore" class="iconfont icon-btn_xiala22"></i>
         <i v-else class="iconfont icon-btn_shouqi22"></i>
         
@@ -352,7 +352,7 @@ export default defineComponent({
         return item;
       });
     });
-    let isMore = ref(true);
+    let isMore = ref(false);
     const changeStatData = () => {
       statWarpHeight.value = document.getElementById("statWarp").offsetHeight;
     };
@@ -593,6 +593,9 @@ export default defineComponent({
     line-height: 30px;
     text-align: center;
     background: linear-gradient(180deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0.8) 100%);
+    i{
+      color:#999;
+    }
   }
   .title {
     height: 60px;

src/components/notice/index.vue

@@ -84,7 +84,7 @@
 					</el-table-column>
 					<el-table-column prop="address" label="操作">
 						<template #default="scope">
-							<span style="cursor: pointer" @click.stop="readFn(scope)">确认已读</span>
+							<span style="cursor: pointer;color:#0084ff" @click.stop="readFn(scope)">已读</span>
 						</template>
 					</el-table-column>
 				</el-table>

src/components/process/Contract.vue

@@ -1370,6 +1370,22 @@ onMounted(() => {
       }
     });
   }
+if(route.query&&route.query.businessId){
+    proxy.post("/contract/detail", { id: route.query.businessId }).then((res) => {
+      setTimeout(()=>{
+        formData.data.id = res.id
+        for (let i = 0; i < formData.data.contractProductList.length; i++) {
+          formData.data.contractProductList[i].id=res.contractProductList[i].id
+        }
+        for (let i = 0; i < formData.data.contractProjectList.length; i++) {
+          formData.data.contractProjectList[i].id=res.contractProjectList[i].id
+        }
+        for (let i = 0; i < formData.data.contractShipmentList.length; i++) {
+          formData.data.contractShipmentList[i].id=res.contractShipmentList[i].id
+        }
+      },2000)
+    });
+  }
 });
 </script>
 

src/components/product/treeList.vue

@@ -27,11 +27,12 @@
         default-expand-all
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
+        :current-node-key="1"
       >
         <template #default="{ node, data }">
           <div class="custom-tree-node">
             <div style="flex: 1">{{ node.label}}</div>
-            <div class="icon-warp" style="float: right; width: 71px; margin-left: 10px" v-show="activeNode == data.id">
+            <div class="icon-warp" style="float: right; width: 71px; margin-left: 10px" v-if="node.label != '全部'" v-show="activeNode == data.id">
               <el-icon :size="17" @click.stop="() => edit(node, data)">
                 <Edit />
               </el-icon>
@@ -102,12 +103,17 @@ const props = defineProps({
     default: [],
   },
 });
-onMounted(() => {});
 const search = ref("");
 const emit = defineEmits(["update:modelValue"]);
 const { proxy } = getCurrentInstance();
-let activeNode = ref('');
+let activeNode = ref('1');
 const treeChange = (e, data) => {
+  let el = document.getElementsByClassName("el-tree")[0].firstElementChild;
+  console.log(el)
+  if(e.id != 1) {
+    //删除el的is-current class name
+    el.classList.remove('is-current')
+  }
   activeNode.value = e.id
   if (proxy.type == "radio") {
     emit("update:modelValue", e.id);
@@ -250,6 +256,22 @@ const handleMouseOver = (data) => {
   console.log(data, "sss");
   // currentNode.id = toRaw(data).id;
 };
+
+//为class为el-tree的第一个子元素添加一个is-current
+const addClass = () => {
+  let el = document.getElementsByClassName("el-tree")[0].firstElementChild;
+  if(proxy.data.length > 0) {
+    el.classList.add("is-current");
+  } else{
+    setTimeout(() => {
+      addClass();
+    }, 300);
+  }
+};
+onMounted(() => {
+  addClass();
+});
+
 </script>
 
 <style lang="scss">

src/views/customer/portrait/com/CustomerInfo.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="content" v-loading="loading">
-    <div>11</div>
+    <div  class="user-name">
+      <i class="iconfont icon-icon_factory1" style="color:#0084ff;margin-right:10px;"></i>{{ detailsData.name }}
+    </div>
     <div class="line">
       <span class="title_" v-if="detailsData.customerCode">客户代码：<span style="color:#000">{{ detailsData.customerCode }}</span></span>
       <span class="title_" v-if="detailsData.customerCode && detailsData.status" style="margin: 0 6px">|</span>
@@ -321,6 +323,12 @@ const getPhone = (res) => {
 </script>
 
 <style lang="scss" scoped>
+.user-name{
+  font-weight: bold;
+  border-bottom:1px solid #dcdcdc;
+  line-height: 30px;
+  margin-bottom: 20px;
+}
 .content {
   font-size: 12px;
   padding: 10px;

src/views/dataBoard/board/customerAnalysis/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="box">
-    <div class="query bck">
+    <div class="query bck" style="margin-top: 10px">
       <el-form :inline="true" :model="queryForm">
         <el-form-item label="国家">
           <el-select

src/views/dataBoard/board/employeeAnalysis/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="tenant">
-    <div class="query bck">
+    <div class="query bck" style="padding-bottom: 0px">
       <el-form :inline="true" :model="queryForm">
         <el-form-item label="查看用户">
           <el-select
@@ -100,7 +100,7 @@
             </div>
           </div>
         </div>
-        <div class="bck" style="margin-left: 20px">
+        <div class="bck" style="margin-left: 20px; flex: 1">
           <TitleInfo :content="titleList[2]"></TitleInfo>
           <div class="one-row" style="margin-top: 15px">
             <div class="one-row-item first" style="margin-right: 15px">
@@ -115,7 +115,7 @@
         </div>
       </div>
       <div style="margin-top: 15px">
-        <div class="bck">
+        <div class="bck scroll">
           <TitleInfo :content="titleList[3]"></TitleInfo>
           <div class="two-row" style="margin-top: 15px">
             <div class="two-row-item first" style="margin-right: 15px">
@@ -201,8 +201,9 @@
           </div>
         </div>
       </div>
+
       <div style="margin-top: 15px">
-        <div class="bck">
+        <div class="bck scroll">
           <TitleInfo :content="titleList[4]"></TitleInfo>
           <div class="two-row" style="margin-top: 15px">
             <div class="two-row-item first" style="margin-right: 15px">
@@ -292,9 +293,9 @@
       </div>
 
       <div style="display: flex; margin-top: 15px">
-        <div class="bck">
+        <div class="bck" style="width: 100%">
           <TitleInfo :content="titleList[5]"></TitleInfo>
-          <div class="two-row" style="margin-top: 15px">
+          <div class="two-row" style="margin-top: 15px; width: 100%">
             <div class="two-row-item first" style="margin-right: 15px">
               <div class="label">待采购</div>
               <div class="value">
@@ -538,6 +539,7 @@ clickBtn(1);
   display: flex;
   .one-row-item {
     min-width: 160px;
+    max-width: 180px;
     padding: 15px;
     border-radius: 10px;
     .label {
@@ -587,6 +589,7 @@ clickBtn(1);
   display: flex;
   .two-row-item {
     min-width: 320px;
+    max-width: 320px;
     padding: 15px;
     border-radius: 10px;
     .label {
@@ -631,4 +634,7 @@ clickBtn(1);
   background: #0084ff;
   color: #fff;
 }
+.scroll {
+  overflow-x: auto;
+}
 </style>

src/views/finance/fundManage/accountPayment/index.vue

@@ -139,10 +139,13 @@
     </el-dialog>
 
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="840px">
-      <FundsPDF v-if="rowData.type != '20'" :rowData="rowData"></FundsPDF>
-      <PaymentPDF v-else :rowData="rowData"></PaymentPDF>
+      <div id="printMe">
+        <FundsPDF v-if="rowData.type != '20'" :rowData="rowData"></FundsPDF>
+        <PaymentPDF v-else :rowData="rowData"></PaymentPDF>
+      </div>
       <template #footer>
         <el-button @click="openPrint = false" size="large">取消</el-button>
+        <el-button v-print="printObj" size="large">打印</el-button>
         <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
       </template>
     </el-dialog>
@@ -854,6 +857,12 @@ const clickDetail = () => {
   formOption.disabled = true;
   getDtl(rowData.value);
 };
+const printObj = ref({
+  id: "printMe",
+  popTitle: "",
+  extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
+  extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+});
 </script>
 
 <style lang="scss" scoped>

src/views/finance/fundManage/depExpenses/index.vue

@@ -222,7 +222,6 @@ const config = computed(() => {
             el: "button",
             click() {
               depModal.value = true;
-              runningWaterId = row.id;
               dtlData.value = row;
               departmentId.value = [];
             },
@@ -279,7 +278,7 @@ const submitDeptForm = async (departmentId) => {
     ElMessage.error("请选择部门");
     return;
   }
-  const params = {
+  let params = {
     deptId: departmentId[departmentId.length - 1],
     accountDeptRunningWaterId: dtlData.value.accountDeptRunningWaterId,
     id: dtlData.value.id,
@@ -401,7 +400,7 @@ const submitForm = async () => {
       return ElMessage("分拆总金额需等于交易金额");
     }
     submitLoading.value = true;
-    const params = {
+    let params = {
       id: formData.data.id,
       deptRunningWaterDetailList: formData.data.accountDeptRunningWaterDetailList,
       accountDeptRunningWaterId: formData.data.accountDeptRunningWaterId,

src/views/finance/fundManage/funds/index.vue

@@ -33,9 +33,12 @@
     </div>
 
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="840px">
-      <FundsPDF :rowData="rowData"></FundsPDF>
+      <div id="printMe">
+        <FundsPDF :rowData="rowData"></FundsPDF>
+      </div>
       <template #footer>
         <el-button @click="openPrint = false" size="large">取消</el-button>
+        <el-button v-print="printObj" size="large">打印</el-button>
         <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
       </template>
     </el-dialog>
@@ -547,7 +550,7 @@ const submitSearch = () => {
     return ElMessage("开始时间不能大于结束时间");
   }
   openSearch.value = false;
-  sourceList.value.pagination.keyword = '';
+  sourceList.value.pagination.keyword = "";
   sourceList.value.pagination.pageNum = 1;
   getList();
 };
@@ -564,6 +567,12 @@ const pushProcessApproval = (row) => {
   });
   return;
 };
+const printObj = ref({
+  id: "printMe",
+  popTitle: "",
+  extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
+  extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+});
 </script>
 
 <style lang="scss" scoped>

src/views/index.vue

@@ -96,7 +96,8 @@
 	</div>
 </template>
 
-<script setup name="Index">
+<script setup >
+// name="Index" 增加缓存
 import { createApp, onMounted, ref } from 'vue'
 import byTableDemo from '../components/byTable/demo'
 import html2canvas from 'html2canvas'

src/views/process/dealWith/index.vue

@@ -185,6 +185,7 @@ const config = computed(() => {
 											flowKey: row.flowKey,
 											id: row.id,
 											processType:nodeType == 1 ? 30 : 10,
+											businessId:row.businessId,
 											version:row.version
 										},
 									});

src/views/salesMange/saleContract/priceSheet/index.vue

@@ -273,7 +273,7 @@
               style="width: 100px; text-align: center"
             ></div>
             <div class="contentRow" style="width: 100px; text-align: center">
-              {{ statistics("quantity", 0) }}
+              {{ statistics("quantity", 2) }}
             </div>
             <div
               class="contentRow"

src/views/system/langConfig/index.vue

@@ -274,6 +274,9 @@ const submitForm = () => {
 		let obj = submitData.value.app.en
 		for (let i = 0; i < keyArr.length; i++) {
 			const element = keyArr[i]
+			if(!obj[element]) {
+				obj[element] = {}
+			}
 			if (i == keyArr.length - 1) {
 				obj[element] = enText
 			} else {
@@ -290,6 +293,7 @@ const submitForm = () => {
 
 const getDtl = (row) => {
 	formData.data = { ...row}
+	console.log(formData)
 	modalType.value = 'edit'
 	dialogVisible.value = true
 	

src/views/system/msg/index.vue

@@ -198,7 +198,7 @@ const config = computed(() => {
 								}
 							).then(() => {
 								proxy
-									.post('/sendMeg/delete', {
+									.post('/pushAnnouncement/delete', {
 										id: row.id,
 									})
 									.then(() => {