采购退货申请主子合并

src/api/request2.js

@@ -867,14 +867,21 @@ export function purchaseReturnJobsubmit(params) {
  * 获取日期任务列表
  *   @param {*} 
  */
+
+// export function getPurchaseReturnRequestList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/purchasereturn-request-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getPurchaseReturnRequestList(params) {
 	return request({
-		url: baseApi + "/wms/purchasereturn-request-main/senior",
+		url: baseApi + "/wms/purchasereturn-request-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
-
 /**
  * 采购退货 获取申请任务明细
  * @param {*}  id 任务id

src/manifest.json

@@ -45,9 +45,9 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
-				],
+                ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "minSdkVersion" : 23
             },

src/pages/purchaseReturn/coms/comReturnRequestCard.vue

@@ -1,21 +1,24 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+ 		<!-- <view class="task_item">
  			<view class="task_text">
  				收货单号 : {{dataContent.purchaseReceiptRecordNumber}}
  			</view>
  			<view class="task_text">
  				供应商代码 : {{dataContent.supplierCode}}
  			</view>
- 		</view>
+ 		</view> -->
  	</request-com-main-card>
  </template>
 
  <script>
  	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
  	export default {
  		components: {
  			requestComMainCard,
+			jobComMainDetailCard
  		},
  		data() {
  			return {};