Quellcode durchsuchen

Merge branch 'stage' into dev0.3

cz vor 1 Jahr
Ursprung
Commit
a67affefd7

+ 1 - 1
src/components/PDF/contractPDF.vue

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

+ 1 - 1
src/components/notice/index.vue

@@ -97,7 +97,7 @@
 						@current-change="handlePageChange" />
 				</div>
 				<div class="notice-btn-box" style="margin-top: 20px">
-					<!-- <el-button plain disabled>点击清空</el-button> -->
+					<!-- <el-button plain disabled>点击清空</el-button> -->	
 					<el-button type="primary" @click="allReadFn"  v-if="noticeData.length != 0">全部已读</el-button>
 				</div>
 			</div>

+ 1 - 4
src/views/process/dealWith/index.vue

@@ -90,12 +90,9 @@ const selectConfig = computed(() => {
 		{
 			label: '流程状态',
 			prop: 'status',
+			isShowAll:false,
 			data: [
 				{
-					label: '待处理',
-					value: '1',
-				},
-				{
 					label: '已发起',
 					value: '2',
 				},