diff --git a/components/psDetail.vue b/components/psDetail.vue
index 7b4c0b6..3714898 100644
--- a/components/psDetail.vue
+++ b/components/psDetail.vue
@@ -217,7 +217,15 @@
 		        <view class="list-container" v-if="pallet&&pallet.instdetailList">
 		          <view v-for="(item, index) in pallet.instdetailList" :key="index" class="list-item">
 					  
-					<view class="item-header" @click="gotocxDetail(item.instno,item.project)">
+					<view class="item-header" @click="()=>{
+						let code=item.instno;
+						let type='2'
+						if(!code){
+							code=item.dwgn
+							type='1'
+						}
+						gotocxDetail(code,item.project,type)
+					}">
 						<text class="item-tip">{{ item.groupDesc }} ({{ item.qty?parseInt(item.qty):'0'}})</text>
 					</view>
 					
@@ -433,9 +441,9 @@
 			immediate: true, // 初次监听即执行
 		},
 		methods: {
-			gotocxDetail(instno,project){
+			gotocxDetail(instno,project,type){
 				uni.navigateTo({
-					url:  `/pages/pallet/tpcxtk?instno=${instno}&project=${project}`
+					url:  `/pages/pallet/tpcxtk?instno=${instno}&project=${project}&type={type}`
 				});
 			},
 			_initDetail(palletAll = this.palletAll) {
diff --git a/pages/pallet/js.vue b/pages/pallet/js.vue
index 6dd903d..971cf38 100644
--- a/pages/pallet/js.vue
+++ b/pages/pallet/js.vue
@@ -58,10 +58,10 @@
 					  </view>
 					</view>
 				</template>
-				<u-upload ref="uUpload" :auto-upload="false" upload-text='' :max-size="10 * 1024 * 1024" :max-count="3" :width="100" :height="100"
+<!--				<u-upload ref="uUpload" :auto-upload="false" upload-text='' :max-size="10 * 1024 * 1024" :max-count="3" :width="100" :height="100"
 				:deletable="true" :source-type="sourceType" style="background-color: #ecf5ff;"
 				@on-remove="onRemove($event,index)" @on-choose-complete="onChooseComplete($event,index)" :file-list="pallet.files">
-				</u-upload>
+				</u-upload>-->
 			</uni-collapse-item>
 		</u-checkbox-group>
 		</uni-collapse>
@@ -386,7 +386,10 @@ export default {
 				// console.log(Compressor)
 		       const Compressor1 = new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
+<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
+=======
+>>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 					// console.log("compressedFile",compressedFile)
 		          // 读取压缩后的图片文件为base64
diff --git a/pages/pallet/ps.vue b/pages/pallet/ps.vue
index 5dcf45a..a92508a 100644
--- a/pages/pallet/ps.vue
+++ b/pages/pallet/ps.vue
@@ -128,7 +128,7 @@
 		  <view class="list-title"><text style="color: #fa3534;">*</text>配送单照片</view>
 		  <view class="devpicon">
 			  <u-upload ref="uUploadps" :auto-upload="false" upload-text='' :max-size="10 * 1024 * 1024" max-count="3" :width="100" :height="100"
-			  @on-remove="onRemovePS" @on-choose-complete="onChooseCompletePS" :file-list="itemList.deliveryPhoto"
+			  @on-remove="onRemovePS" @on-choose-complete="onChooseCompletePS" :file-list="itemList.deliveryPhoto0"
 			  	:deletable="true" :source-type="sourceType" style="background-color: #ecf5ff;">
 			  </u-upload>
 		  </view>
@@ -404,6 +404,7 @@ export default {
 				deliveryCar:'',// 车牌号
 				files: [],
 				deliveryPhoto:[], // 配送单图片
+        deliveryPhoto0:[],
 				departCode:"",
 				workshop:"",
 				location:"",
@@ -600,7 +601,10 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
+<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
+=======
+>>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();
@@ -668,7 +672,7 @@ export default {
 				const base64 = evt.target.result.substr(22)
 				console.log("base64",base64)
 				resolve(base64)
-				that.itemList.deliveryPhoto[index]['url']="data:image/png;base64"+base64;
+				that.itemList.deliveryPhoto0[index]['url']="data:image/png;base64"+base64;
 				that.$forceUpdate();
 				};
 				
@@ -689,14 +693,17 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
+<<<<<<< HEAD
 				convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
+=======
+>>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();
 		          reader.onload = (e) => {
 		            const base64 = e.target.result;
 		            resolve(base64);
-					that.itemList.deliveryPhoto[index]={
+					that.itemList.deliveryPhoto0[index]={
 						url:base64
 					};
 					that.$forceUpdate();
@@ -1281,7 +1288,7 @@ export default {
 				return false
 			}
 			
-			if(!this.itemList.deliveryPhoto||this.itemList.deliveryPhoto.length<1){
+			if(!this.itemList.deliveryPhoto0&&this.itemList.deliveryPhoto0.length<1){
 				this.$refs.uToast.show({
 				  title: "请上传配送单图片!",
 				  type: "warning",
@@ -1292,9 +1299,10 @@ export default {
 			
 			// 配送单图片
 			this.itemList.files=[];
-			this.itemList.deliveryPhoto.forEach(item=>{
+			this.itemList.deliveryPhoto0.forEach(item=>{
 				this.itemList.files.push(item.url);
 			});
+      this.itemList.deliveryPhoto=this.itemList.files
 			this.$forceUpdate();
 			
 			var data=[];
diff --git a/pages/pallet/xp.vue b/pages/pallet/xp.vue
index 8bd543a..477f726 100644
--- a/pages/pallet/xp.vue
+++ b/pages/pallet/xp.vue
@@ -68,10 +68,10 @@
     				  <uni-icons @click="del(index)" type="closeempty" size="16" color="#ff0000"></uni-icons>
     				</view>
     			</template>
-    			<u-upload ref="uUpload" :auto-upload="false" upload-text='' :max-size="10 * 1024 * 1024" :max-count="3" :width="100" :height="100"
+    			<!-- <u-upload ref="uUpload" :auto-upload="false" upload-text='' :max-size="10 * 1024 * 1024" :max-count="3" :width="100" :height="100"
     			:deletable="true" :source-type="sourceType" style="background-color: #ecf5ff;"
     			@on-remove="onRemove($event,index)" @on-choose-complete="onChooseComplete($event,index)" :file-list="pallet.files">
-    			</u-upload>
+    			</u-upload> -->
     		</uni-collapse-item>
     	</uni-collapse>
     	
@@ -392,7 +392,10 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
+<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
+=======
+>>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();
diff --git a/pages/pallet/yz.vue b/pages/pallet/yz.vue
index 6444d78..50e8929 100644
--- a/pages/pallet/yz.vue
+++ b/pages/pallet/yz.vue
@@ -454,7 +454,10 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
+<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
+=======
+>>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();