gjy 3 lat temu
rodzic
commit
049d792b29

+ 28 - 7
src/views/houseSelfCollect/inspectInfo.vue

@@ -48,6 +48,14 @@
                   :value="item.goodsName" />
               </ws-select>
             </ws-form-item>
+            <ws-form-item label="扣杂" span="1" prop="buckleWeightRatio">
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.BuckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
+                :disabled="disabled" />
+                <ws-input v-if='types!=3' type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
+                :disabled="disabled" />
+                <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="未复检" maxlength="100" size="small"
+                disabled />
+            </ws-form-item>
             <ws-form-item label="扣重比" span="1" prop="buckleWeightRatio">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleWeightRatio" placeholder="请输入扣重比" maxlength="100" size="small"
                 :disabled="disabled" />
@@ -85,6 +93,10 @@
             <ws-form-item label="水分(%)" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
                 @change="waterContentChange('water')" :disabled="disabled" />
+                <ws-input v-if='types!=3' type="number" @mousewheel.native.prevent v-model="inspect.reWaterContent" placeholder="请输入水分占比" maxlength="100" size="small"
+                :disabled="disabled" />
+                <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reWaterContent" placeholder="未复检" maxlength="100" size="small"
+                disabled />
             </ws-form-item>
             <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
@@ -153,6 +165,7 @@
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
           natureOfGrainPurchase:'贸易粮',
+          BuckleMiscellaneous:0,
           type:'潮粮'
         },
         disabled: false,
@@ -204,6 +217,10 @@
         this.disabled = false
         this.disabled1 = true
         this.information = '编辑'
+      }else if (this.types == 4) {
+        this.disabled = false
+        this.disabled1 = true
+        this.information = '编辑'
       }
       else{
         this.disabled1 = false
@@ -252,18 +269,23 @@
             }).then((response) => {
               //编辑接口
               this.inspect.pictureAddress = response.data.url
+              console.log(this.types)
+              if(this.types==3){
+                this.inspect.flag=0
+              }
                getinspectEdit(this.inspect)
                 .toPromise()
-                .then((response) => {
+                .then((response) => { 
+                  this.types = ''
+        // this.inspect = [] 
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
                 })
             })
             this.dialogTableVisible = true;
           }
         })
-        this.types = ''
-        // this.inspect = [] 
-        this.isShowPrint = false
-        this.$router.push({path:'inspectionManagement'})
+       
       },
       typeChange(){
         if(this.inspect.type == '干粮' && this.inspect.goodsName){
@@ -275,10 +297,8 @@
         }
       },
       closePrint(){
-           this.types = ''
         // this.inspect = [] 
         this.isShowPrint = false
-        this.$router.push({path:'inspectionManagement'})
       },
       print() {
         if (!this.inspect.qualityNo) {
@@ -563,6 +583,7 @@
               return false
             })
         } else if (this.types == 3) {
+          this.inspect.flag=0
           this.$confirm('确定保存质检信息?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',

+ 2 - 1
src/views/houseSelfCollect/inspectionManagement.vue

@@ -86,7 +86,8 @@
       <el-table-column width="400" 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!='已称皮重'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">编辑</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, 4)" v-if="scope.row.status!='已称皮重'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">复检</el-button>
           <el-button @click="del(scope.row)" v-if="scope.row.status=='已质检'" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
           <el-button @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
         </template>

+ 2 - 2
vue.config.js

@@ -141,8 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.108:8090/',
-        // target: 'http://192.168.1.115:8090/',
+        // target: 'http://192.168.1.101: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.119:8090/',