前端 pc 更新sdy

src/views/houseSelfCollect/acquisitionManagementAdd.vue

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

src/views/houseSelfCollect/inspectionManagement.vue

@@ -90,7 +90,15 @@
       </el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
-      <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
+      <el-table-column prop="qualityInspector" label="质检员">
+          <template scope="scope">
+            <span>{{scope.row.qualityInspector}}</span>
+            <span v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
+          </template>
+
+
+
+      </el-table-column>
       <el-table-column prop="updateDate" label="质检时间"></el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
@@ -105,7 +113,6 @@
       <el-table-column width="500" label="操作">
         <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=='已初检'&& 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>

src/views/houseSelfCollect/paymentManagement.vue

@@ -8,7 +8,7 @@
         <ws-button type="primary"  @click="screen()">全部</ws-button> -->
         <ws-button
             :type="searchType == 0 ? 'primary' : ''"
-            @click="screen(0)"
+            @click="screen(1)"
             >待审核</ws-button
           >
           <ws-button
@@ -110,23 +110,23 @@
         <template scope="scope">
           
           <el-button
-            v-show="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="settlement(1, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
           >结算</el-button>
           <el-button
-            v-show="scope.row.approveStatus || scope.row.status == '已驳回'"
+            v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
             @click="settlement(2, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
           >查看</el-button>
           <el-button
-            v-show="scope.row.approveStatus || (scope.row.status != '待结算'&& !scope.row.approveStatus) "
+            v-if="scope.row.approveStatus || (scope.row.status != '待结算'&& !scope.row.approveStatus) "
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
           <el-button
             type="danger"
-            v-show="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="del(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
           >删除</el-button>

src/views/houseSelfCollect/settlement.vue

@@ -69,11 +69,14 @@
                 <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
-                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
+                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="净重（公斤）" span="1" prop="waterContent">
                 <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />
             </ws-form-item>
+            <ws-form-item  v-if='paymentList.type=="干粮"' label="扣单价（元/公斤）" span="1" prop="unitDeduction">
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
+            </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
           <ws-info-table>

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.122:8090/',
+        target: 'http://192.168.1.107:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',