前端

public/static/payprint1.html

@@ -1258,7 +1258,6 @@
             if (this.printData.compName == undefined) this.printData.compName = ''
             document.title = this.printData.compName + '结算凭证'
             window.print()
-            console.log(11111111111111)
                 // sessionStorage.removeItem('selectPrint_selectPrintList');
                 // sessionStorage.removeItem('selectPrint_selectCustomerList');
             window.onafterprint = function(event) {

src/views/contractManagement/acquisitionContract.vue

@@ -514,6 +514,7 @@
           })
           })
           .catch((response) => {
+            row.status=row.currectstatus
                 // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           })
         

src/views/contractManagement/purchaseContract.vue

@@ -613,6 +613,7 @@ export default {
                   this.getList()
                 })
                 .catch((response) => {
+                  row.status = row.currectstatus
                   // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
                 })
             })
@@ -622,6 +623,7 @@ export default {
             })
         })
         .catch((response) => {
+          row.status = row.currectstatus
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
         })
 

src/views/contractManagement/salesContract.vue

@@ -564,6 +564,7 @@ export default {
                 this.getList()
               })
               .catch((response) => {
+                row.status = row.currectstatus
                 // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
               })
           })

src/views/houseSelfCollect/paymentManagement.vue

@@ -214,7 +214,7 @@
             <ws-form-item label="付款日期" prop=" paymentDate">
               <el-date-picker v-model="payments.paymentDate" type="date" placeholder="选择日期"></el-date-picker>
             </ws-form-item>
-            <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
+            <ws-form-item label="上传截图" prop="paymentScreenshot"></ws-form-item>
             <div class="upLoad">
               <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
                 :on-success="handleAvatarSuccess">

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -548,6 +548,7 @@
 					}
 					if(localStorage.getItem('goodsName')){
 						this.dataList.goodsName=localStorage.getItem('goodsName')
+						this.dataList.goodsNameKey=localStorage.getItem('goodsName')
 					}
 					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
 					.toPromise()
@@ -580,9 +581,16 @@
 						//  this.agent = response
 					})
 					this.dataList1.contractNo=localStorage.getItem('contractNo')
-					if(localStorage.getItem('weight')){
-						this.dataList1.weight=localStorage.getItem('weight')
+					if(this.dataList.taskTypeKey==2){
+						if(localStorage.getItem('goodsName')){
+							this.dataList1.goodsName=localStorage.getItem('goodsName')
+							this.dataList1.goodsNameKey=localStorage.getItem('goodsNameKey')
+						}
+						if(localStorage.getItem('weight')){
+							this.dataList1.weight=localStorage.getItem('weight')
+						}
 					}
+					
 				}
 			}
 			if(localStorage.getItem('supplygoods1')){
@@ -907,6 +915,8 @@
 								})
 								.toPromise()
 								.then(response => {
+									localStorage.setItem('goodsName',response.goodsName)
+									localStorage.setItem('goodsNameKey',response.goodsNameKey)
 									this.$set(this.dataList1, 'goodsName', response.goodsName)
 									this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
 									this.$set(this.dataList1, 'grade', response.grade)
@@ -1554,6 +1564,12 @@
 				localStorage.removeItem('warehouse')
 				localStorage.removeItem('contractNo');
             	localStorage.removeItem('taskTypeKey');
+				localStorage.removeItem('inOutType')
+				localStorage.removeItem('inOutTypeKey')
+				localStorage.removeItem('contractNo')
+				localStorage.removeItem('goodsName')
+				localStorage.removeItem('goodsNameKey')
+				localStorage.removeItem('weight')
 				// this.dataList.goodsNameKey =
 				// this.dataList.positionId =
 				// this.dataList.baseId =
@@ -1704,9 +1720,11 @@
 						this.flag = 5
 						break
 				}
+				localStorage.setItem('inOutType',e)
 				for (var i = 0; i < this.storageType1.length; i++) {
 					if (this.storageType1[i].constValue == e) {
 						this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+						localStorage.setItem('inOutTypeKey',this.storageType1[i].constKey)
 					}
 				}
 			},
@@ -1783,16 +1801,26 @@
 				this.tasknumber()
 				if(localStorage.getItem('taskTypeKey')){
 					if(localStorage.getItem('taskTypeKey') == 1){
-						this.$set(this.dataList, 'inOutType', '销售出库')
-						this.$set(this.dataList, 'inOutTypeKey', '1')
+						if(localStorage.getItem('inOutType')){
+							this.$set(this.dataList, 'inOutType', localStorage.getItem('inOutType'))
+							this.$set(this.dataList, 'inOutTypeKey', localStorage.getItem('inOutTypeKey'))
+						}else{
+							this.$set(this.dataList, 'inOutType', '销售出库')
+							this.$set(this.dataList, 'inOutTypeKey', '1')
+						}
 						this.$set(this.dataList, 'goodsName', '玉米')
 						this.$set(this.dataList, 'goodsNameKey', '1')
 						this.$set(this.dataList1, 'goodsName', '玉米')
 						this.$set(this.dataList1, 'goodsNameKey', '1')
 						this.flag = 1
 					}else if(localStorage.getItem('taskTypeKey') == 2){
-						this.$set(this.dataList1, 'inOutType', '采购入库')
-						this.$set(this.dataList1, 'inOutTypeKey', '2')
+						if(localStorage.getItem('inOutType')){
+							this.$set(this.dataList1, 'inOutType', localStorage.getItem('inOutType'))
+							this.$set(this.dataList1, 'inOutTypeKey', localStorage.getItem('inOutTypeKey'))
+						}else{
+							this.$set(this.dataList1, 'inOutType', '采购入库')
+							this.$set(this.dataList1, 'inOutTypeKey', '2')
+						}
 						this.flag = 8
 					}else if(localStorage.getItem('taskTypeKey') == 3){
 						this.$set(this.dataList, 'inOutType', '移库出库')

src/views/tranManagement/tranManagementVehicleDispatchinghistory.vue

@@ -342,8 +342,8 @@
               .toPromise()
               .then((response) => {
                 this.$message.success('删除成功')
-                if (this.deptBudgetList.tranCarInfoList1.length > 1) {
-                  this.deptBudgetList.tranCarInfoList1.splice(index, 1)
+                if (this.deptBudgetList.records.length > 1) {
+                  this.deptBudgetList.records.splice(index, 1)
                 }
                 this.getList()
               })