前端

public/static/inspection.html

@@ -153,7 +153,8 @@
             <td class="col">{{tableData.waterContent}}</td>
             <td class="col col-bgc">热损伤（%）</td>
             <td class="col">{{tableData.jiaorenli}}</td>
-            <td class="col col-bgc">单价（元/公斤）</td>
+            <td v-if="tableData.confirm == '1'" class="col col-bgc">单价（元/公斤）</td>
+            <td v-else class="col col-bgc">待定单价（元/公斤）</td>
             <td class="col">{{tableData.tidalGrainPrice}}</td>
           </tr>
           <tr class="row">
@@ -161,8 +162,12 @@
             <td class="col">{{tableData.impurity}}</td>
             <td class="col col-bgc">霉变粒（%）</td>
             <td class="col">{{tableData.mildewGrain}}</td>
-            <td class="col col-bgc" colspan="2">购粮性质</td>
-            <td class="col" colspan="2">{{tableData.natureOfGrainPurchase}}</td>
+            <td v-if="tableData.paramType == '1'"  class="col col-bgc">扣杂</td>
+            <td v-if="tableData.paramType == '1'"  class="col">{{tableData.buckleMiscellaneous}}</td>
+            <td v-if="tableData.paramType == '1'" class="col col-bgc" colspan="1">购粮性质</td>
+            <td v-else class="col col-bgc" colspan="2">购粮性质</td>
+            <td v-if="tableData.paramType == '1'" class="col" colspan="1">{{ tableData.natureOfGrainPurchase }}</td>
+            <td v-else class="col" colspan="2">{{ tableData.natureOfGrainPurchase }}</td>
           </tr>
         </table>
         <div class="bottom">
@@ -241,7 +246,8 @@
           <div>{{tableData.jiaorenli}}</div>
         </div>
         <div class="small-row">
-          <div>单价（元/公斤）</div>
+          <div v-if="tableData.confirm == '1'">单价（元/公斤）</div>
+          <div v-else>待定单价（元/公斤）</div>
           <div>{{tableData.tidalGrainPrice}}</div>
         </div>
         <div class="small-row">
@@ -249,9 +255,13 @@
           <div>{{tableData.impurity}}</div>
         </div>
         <div class="small-row">
-          <div>>霉变粒（%）</div>
+          <div>霉变粒（%）</div>
           <div>{{tableData.mildewGrain}}</div>
         </div>
+        <div v-if="tableData.paramType == '1'" class="small-row">
+          <div>扣杂</div>
+          <div>{{tableData.buckleMiscellaneous}}</div>
+        </div>
         <div class="small-row">
           <div>购粮性质</div>
           <div>{{tableData.natureOfGrainPurchase}}</div>

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"

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 }}

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -381,7 +381,8 @@
     },
     mounted() {},
     methods: {
-      paramTypeChange(){
+      paramTypeChange(e){
+        console.log(e)
         // this.makeTableList()
       },
       // 查看/编辑获取数据

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -36,7 +36,8 @@
         <td class="col">{{ printData.waterContent }}</td>
         <td class="col col-bgc">热损伤（%）</td>
         <td class="col">{{ printData.jiaorenli }}</td>
-        <td class="col col-bgc">单价（元/公斤）</td>
+        <td v-if="printData.confirm == '1'" class="col col-bgc">单价（元/公斤）</td>
+        <td v-else class="col col-bgc">待定单价（元/公斤）</td>
         <td v-if="printData.type == '潮粮'" class="col">{{ printData.tidalGrainPrice }}</td>
         <td v-else class="col">{{ printData.dryGrainPrice }}</td>
       </tr>
@@ -45,8 +46,12 @@
         <td class="col">{{ printData.impurity }}</td>
         <td class="col col-bgc">霉变粒（%）</td>
         <td class="col">{{ printData.mildewGrain }}</td>
-        <td class="col col-bgc" colspan="2">购粮性质</td>
-        <td class="col" colspan="2">{{ printData.natureOfGrainPurchase }}</td>
+        <td v-if="printData.paramType == '1'"  class="col col-bgc">扣杂</td>
+        <td v-if="printData.paramType == '1'"  class="col">{{printData.buckleMiscellaneous}}</td>
+        <td v-if="printData.paramType == '1'" class="col col-bgc" colspan="1">购粮性质</td>
+        <td v-else class="col col-bgc" colspan="2">购粮性质</td>
+        <td v-if="printData.paramType == '1'" class="col" colspan="1">{{ printData.natureOfGrainPurchase }}</td>
+        <td v-else class="col" colspan="2">{{ printData.natureOfGrainPurchase }}</td>
       </tr>
     </table>
     <div class="bottom">

src/views/houseSelfCollect/inspectInfo.vue

@@ -3,7 +3,7 @@
   <div class="center">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left titleup">{{ information }}质检信息</h2>
+        <h2 class="bg-left titleup">{{ information }}信息</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="cancel"><img width="6" height="10"
@@ -54,9 +54,9 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item v-else label="扣杂" span="1" prop="buckleWeightRatio">
-              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleMiscellaneous" @input="waterContentChange" placeholder="请输入扣杂" maxlength="100" size="small"
+              <ws-input type="number" style="padding-right:30px" @mousewheel.native.prevent v-model="inspect.buckleMiscellaneous" @input="waterContentChange" placeholder="请输入扣杂" maxlength="100" size="small"
                 :disabled="disabled" />
-                <ws-input v-if='types==4' type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
+                <ws-input v-if='types==4' type="number"  @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
                 />
                 <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="未复检" maxlength="100" size="small"
                 disabled />
@@ -92,7 +92,8 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="水分（%）" span="1" prop="waterContent">
-              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
+
+              <ws-input type="number" @mousewheel.native.prevent style="padding-right:30px" v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
                 @change="waterContentChange('water')" :disabled="disabled" />
                 <ws-input v-if='types==4' type="number" @mousewheel.native.prevent v-model="inspect.reWaterContent" placeholder="请输入水分占比" maxlength="100" size="small"
                 />
@@ -174,7 +175,7 @@
         disabled: false,
         disabled1: false,
         types: '1',
-        information: '添加',
+        information: '添加初检',
         goodNameList: [],
         gradeList: [],
         customerList: [],
@@ -197,7 +198,7 @@
       this.types = this.$route.query.type
       if(!this.types){
           this.types = 1
-           this.information = '添加'
+           this.information = '添加初检'
            this.disabled = false
            this.inspect = {
           tidalGrainPrice: 0,
@@ -215,19 +216,19 @@
       if (this.types == 2) {
         this.disabled = true
         this.disabled1 = true
-        this.information = '查看'
+        this.information = '查看质检'
       } else if (this.types == 3) {
         this.disabled = false
         this.disabled1 = true
-        this.information = '编辑'
+        this.information = '编辑初检'
       }else if (this.types == 4) {
         this.disabled = true
         this.disabled1 = true
-        this.information = '编辑'
+        this.information = '编辑复检'
       }else if (this.types == 5) {
         this.disabled = false
         this.disabled1 = true
-        this.information = '编辑'
+        this.information = '确认质检'
       }
       else{
         this.disabled1 = false

src/views/houseSelfCollect/inspectionManagement.vue

@@ -66,7 +66,19 @@
       <el-table-column prop="customerName" label="客户"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
-      <el-table-column prop="waterContent" label="水分（%）"></el-table-column>
+      <el-table-column prop="waterContent" label="水分（%）" width="120">
+        <template scope="scope">
+          <span class="water-left">{{scope.row.waterContent}}</span> 
+          <span class="water-line">|</span> 
+          <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span> 
+        </template>
+      </el-table-column>
+       <el-table-column prop="buckleMiscellaneous" label="扣杂">
+         <template scope="scope">
+           <div v-if="scope.row.paramType == 1"> <span>{{scope.row.buckleMiscellaneous}} | {{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span></div>
+         <!-- <div v-else>{{scope.row.reBuckleMiscellaneous}}</div> -->
+        </template>
+       </el-table-column>
        <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column
         prop="tidalGrainPrice"
@@ -96,8 +108,8 @@
         <template slot-scope="scope">
           <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
           
-          <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
-           <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button>
+          <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
+           <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1' && scope.row.status=='已复检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button>
            <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
             <!-- <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">初检</el-button>
             <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">确认</el-button>
@@ -384,4 +396,8 @@ export default {
 /deep/.el-dialog__body {
   padding: 20px !important;
 }
+.water-left,.water-right{
+  width: 45%;
+  display: inline-block;
+}
 </style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -350,21 +350,21 @@ export default {
           this.deptBudgetTotal = response.total
         })
         this.isShowAdopt = true
-     getpayment({
-         currentPage: 1,
-        pageSize: 99999,
-        warehouseName: this.warehouseName,
-        managementType : 1 
-      })
-        .toPromise()
-        .then((response) => {
-          for(let i = 0 ; i < response.length ; i++){
-            if(response[i].taskId){
-              this.isShowAdopt = true
-              return
-            }
-          }
-        })
+    //  getpayment({
+    //      currentPage: 1,
+    //     pageSize: 99999,
+    //     warehouseName: this.warehouseName,
+    //     managementType : 1 
+    //   })
+    //     .toPromise()
+    //     .then((response) => {
+    //       for(let i = 0 ; i < response.length ; i++){
+    //         if(response[i].taskId){
+    //           this.isShowAdopt = true
+    //           return
+    //         }
+    //       }
+    //     })
     },
     del(row) {
       this.$confirm(

src/views/houseSelfCollect/settlement.vue

@@ -161,12 +161,15 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "1"' label="扣重" span="1" prop="waterContent">
-              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="潮粮"' label="掉水(%)" span="1" prop="waterContent">
+            <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "2"' label="扣重（公斤）" span="1" prop="waterContent">
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1' label="掉水(%)" span="1" prop="waterContent" >
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin" placeholder="请输入掉水" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="潮粮"' label="基数" span="1" prop="waterContent">
+            <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1' label="基数" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.base" placeholder="请输入基数" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="毛重（公斤）" span="1" prop="waterContent">
@@ -624,7 +627,7 @@ export default {
           return chineseStr;
         },
     print() {
-      if(this.paymentList.type == '潮粮'){
+      if(this.paymentList.type == '潮粮' && this.paymentList.qualityInspectionManagement.paramType != 1){
         if (!this.paymentList.buckleWeightRatio) {
           this.$message({
             message: '扣重比不能为空',

src/views/statisticalReport/autoSettlementList.vue

@@ -1252,6 +1252,7 @@ export default {
     },
     //列表
     getList() {
+      console.log(this.contractNo,"this.contractNo值")
       autoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,

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()
         })
     },

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(() => {

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>

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">

vue.config.js

@@ -141,12 +141,16 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
+<<<<<<< HEAD
         target: 'http://192.168.1.102:8090/',
         // target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.122:8090/',
         // target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.121:8090/',
+=======
+        target: 'http://192.168.1.122:8090/',
+>>>>>>> 20fd8242948593b378fc3240f9b199b43198824a
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',