zhangyuewww 3 年之前
父节点
当前提交
ae4baf7865

+ 2 - 2
src/views/contractManagement/purchaseContractAdd.vue

@@ -445,9 +445,9 @@
 
       <ws-info-table>
         <!--已付款(元)-->
-        <ws-form-item label="已付款(元)" span="1" prop="goodsNameKey">
+        <ws-form-item label="已付款(元)" span="1" prop="mildewGrain">
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+            v-model="deptBudgetList.contractProcessInfo.mildewGrain"
             placeholder="请输入已付款(元)"
             maxlength="100"
             size="small"

+ 2 - 2
src/views/contractManagement/purchaseContractExamine.vue

@@ -189,8 +189,8 @@
       </div>
       <ws-info-table>
          <!--已付款(元)-->
-        <ws-form-item label="已付款(元)" span="1" prop="goodsNameKey">
-          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
+        <ws-form-item label="已付款(元)" span="1" prop="mildewGrain">
+          {{deptBudgetList.contractProcessInfo.mildewGrain}}
         </ws-form-item>
         <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
           {{ deptBudgetList.contractProcessInfo.goodsName }}

+ 2 - 4
src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -645,8 +645,6 @@ export default {
     },
     //定金
     amendconfirm() {
-      this.contractManagementInfo.deposit = this.orderList.deposit 
-      this.contractManagementInfo.depositUrl = this.depositUrl
       this.$confirm(`确定提交定金信息?`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -657,8 +655,7 @@ export default {
             this.contractManagementInfoList.id = this.contractNoList[i].id
           }
         }
-        //  this.contractManagementInfoList.deposit = this.deposit
-        // this.$set(this.contractManagementInfoList,'deposit',this.deposit)
+        this.contractManagementInfoList.deposit = this.orderList.deposit 
         this.contractManagementInfoList.depositUrl = this.depositUrl
         addDisOrRemarks(this.contractManagementInfoList)
           .toPromise()
@@ -1009,6 +1006,7 @@ export default {
           this.contractNoList = response
           this.option = this.contractNoList
        this.contractNo = this.option[0].contractNo
+       this.contractchange(this.contractNo)
        this.getList()
         })
     },

+ 2 - 2
src/views/statisticalReport/stockSaleOutReportList.vue

@@ -380,7 +380,7 @@
 				this.collectForm1 = true
 			},
 			adoptRemarks() {
-				this.remarkInformation.remark = this.orderList.remark
+				// this.remarkInformation.remark = this.orderList.remark
 				this.$confirm(`确定要保存备注信息?`, {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -392,7 +392,7 @@
 								this.remarkInformationList.id = this.contractNoList[i].id
 							}
 						}
-						this.remarkInformationList.remark = this.remark
+						this.remarkInformationList.remark = this.orderList.remark
 						disOrRemarks(this.remarkInformationList)
 							.toPromise()
 							.then(() => {

+ 1 - 1
src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -377,7 +377,7 @@
             <span v-if='!scope.row.approved'>驳回</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="审核时间"></el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
         <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
      </el-table>
     </div>

+ 2 - 2
src/views/taskManagement/moveWarehouseTask.vue

@@ -66,9 +66,9 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
-        <el-table-column prop="weight" label="出库量(吨)">
+        <el-table-column prop="deliveryVolume" label="出库量(吨)">
         </el-table-column>
-        <el-table-column prop="weightIn" label="入库量(吨)">
+        <el-table-column prop="storageVolume" label="入库量(吨)">
         </el-table-column>
         <el-table-column prop="stockReturnCount" label="退库量(吨)">
            <template slot-scope="scope">