更新

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/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,7 @@
                 :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 +174,7 @@
         disabled: false,
         disabled1: false,
         types: '1',
-        information: '添加',
+        information: '添加初检',
         goodNameList: [],
         gradeList: [],
         customerList: [],
@@ -197,7 +197,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 +215,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

@@ -96,8 +96,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>

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.101:8090/',
+        target: 'http://192.168.1.122:8090/',
         // target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.122:8090/',
         // target: 'http://192.168.1.115:8090/',