Merge branch 'dev'

src/assets/css/index.scss

@@ -261,7 +261,15 @@ li {
 }
 
 .van-tabbar--fixed,.van-tabbar{
-    z-index: 10000!important;
+    z-index: 3!important;
+}
+
+
+.van-nav-bar{
+    position: fixed!important;
+    top: 0;
+    left: 0;
+    right: 0;
 }
 
 

src/lang/cn.js

@@ -9,7 +9,7 @@ import {
 export const lang = {
 	common: {
 		//消息，工作台，物联网，我的,请输入关键词，添加没有更多了，释放即可刷新，下拉即可刷新，加载中，加载失败，加载完成，没有更多了，返回，提交，修改成功，新增成功，删除成功，确定，取消，提示,自动，手动，正常，运行，离线，明细,请选择,删除，添加明细,标题,请添加明细
-		//操作成功,产品明细,设备状态,正常,工作模式,自动,设备参数,型号,无匹配数据,选择日期,选择时间
+		//操作成功,产品明细,设备状态,正常,工作模式,自动,设备参数,型号,无匹配数据,选择日期,选择时间，查看，合同变更
 		message: '消息',
 		workbench: '工作台',
 		things: '物联网',
@@ -59,6 +59,8 @@ export const lang = {
 		selectTime: '选择时间',
 		selectDate:'选择日期',
 		selectTime:'选择时间',
+		view:'查看',
+		contractChange:'合同变更',
 	},
 	historyMessage:{
 		//历史消息，全部，消息类型,发送时间,消息内容

src/views/JXSK/salesContract/index.vue

@@ -15,6 +15,7 @@
   />
   <van-pull-refresh v-model="loading" @refresh="onRefresh">
     <div class="list">
+      0
       <van-list
         v-model:loading="loading"
         :finished="finished"

src/views/home/index.vue

@@ -98,7 +98,9 @@ const logout = () => {
 <style lang="scss">
 .home {
 	background: #fff;
-	min-height: 100%;
+	min-height: calc(100% - 46px);
+	position: relative;
+	top:-46px;
 	.van-nav-bar {
 		background: rgba(0, 0, 0, 0);
 	}

src/views/main.vue

@@ -179,7 +179,8 @@ watch(router.currentRoute, (to, from) => {
 	bottom: 0;
 	padding-bottom:65px;
 	overflow-y: auto;
-	z-index: 1000;
+	
+	padding-top:46px;
 }
 .footer-icon{
 	font-size: 20px;

src/views/processApproval/components/ContractAlteration.vue

@@ -965,7 +965,7 @@
     tabsChange,
   });
   onMounted(() => {
-    proxy.post("/contract/detail", { id: props.queryData.contractId }).then((res) => {
+    proxy.post("/contract/detail", { id: route.query.contractId }).then((res) => {
       
       for (const key in res.data) {
         formData.data[key] = res.data[key];

src/views/processApproval/components/SendSubscribe.vue

@@ -59,8 +59,6 @@
 								:name="$t('purchased.procurementDescription')"
 								:label="$t('purchased.procurementDescription')"
 								:placeholder="$t('purchased.pleaseFillInTheProcurementDescription')"
-								
-								
 								rows="3"
 							/>
 						</van-cell-group>

src/views/salesContract/contract/index.vue

@@ -10,6 +10,7 @@
       </van-list>
     </div>
   </van-pull-refresh>
+  <van-action-sheet v-model:show="actionType" :actions="actions" @select="onSelect" />
 </template>
 <script setup>
 import { ref, getCurrentInstance } from "vue";
@@ -25,6 +26,20 @@ const onClickRight = () => {
     },
   });
 };
+const actionType = ref(false);
+const actions = ref([
+  {
+    name: proxy.t("common.view"),
+    type: "1",
+  },
+  {
+    name: proxy.t("common.contractChange"),
+    type: "2",
+  },
+  {
+    name: proxy.t("common.cancel"),
+  },
+]);
 const req = ref({
   pageNum: 1,
   keyword: null,
@@ -61,15 +76,33 @@ const getList = (type) => {
       loading.value = false;
     });
 };
+let rowData = ref({});
+const onSelect = (item) => {
+  if (item.type === "1") {
+    proxy.$router.push({
+      path: "/main/processDtl",
+      query: {
+        flowKey: "contract_flow",
+        id: rowData.value.flowId,
+        processType: 20,
+      },
+    });
+  } else if (item.type === "2") {
+    proxy.$router.push({
+      path: "/main/processDtl",
+      query: {
+        flowKey: "contract_update_flow",
+        flowName:'销售合同变更',
+        contractId: rowData.value.id,
+      },
+    });
+  } else{
+    actionType.value = false;
+  }
+};
 const toDtl = (row) => {
-  proxy.$router.push({
-    path: "/main/processDtl",
-    query: {
-      flowKey: "contract_flow",
-      id: row.flowId,
-      processType: 20,
-    },
-  });
+  actionType.value = true;
+  rowData.value = row;
 };
 const listConfig = ref([
   {

src/views/working/index.vue

@@ -139,6 +139,8 @@ onActivated(() => {
   background-color: #f1f1f1;
   padding: 12px;
   color: #333;
+  position: relative;
+  top:-46px;
   
   .my-swipe{
     height: 150px;