Domů Procházet Nápověda
Registrovat se Přihlásit se
wangchao
/
yiliangyiyun-pc-jj
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

gjy před 3 roky
rodič
a3bea57d3c cd5cb20816
revize
24d9a4b2de
7 změnil soubory, kde provedl 44 přidání a 26 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 13 9
      public/static/weightCheck.html
  2. 14 7
      src/views/houseSelfCollect/inspectInfo.vue
  3. 3 3
      src/views/houseSelfCollect/inspectionManagement.vue
  4. 1 1
      src/views/houseSelfCollect/settlement.vue
  5. 2 1
      src/views/houseSelfCollect/weighingManagement.vue
  6. 10 4
      src/views/houseSelfCollect/weightCheck.vue
  7. 1 1
      vue.config.js

+ 13 - 9
public/static/weightCheck.html
Zobrazit soubor 

@@ -10,6 +10,7 @@
 
       table tr td {
 
         border: 2px solid #333333;
 
         padding: 5px 0;
 
+        height: 43px;
 
       }
 
 
       #app {
 
@@ -19,8 +20,8 @@
 
 
       .content {
 
         width: 1000px;
 
-        height: 583px;
 
-        margin: auto;
 
+        padding: 70px 20px 20px 20px;
 
+        font-size: 18px;
 
         position: absolute;
 
         top: 0;
 
         bottom: 0;
 
@@ -42,12 +43,11 @@
 
       .bottom-row1 {
 
         display: flex;
 
         /* justify-content: space-between; */
 
-        margin: 20px 0;
 
+        margin-top: 5px 0;
 
       }
 
 
       .bottom-row2 {
 
         display: flex;
 
-        margin: 10px 0;
 
       }
 
 
       img {
 
@@ -57,11 +57,11 @@
 
       }
 
 
       .config {
 
-        margin-top: 20px;
 
+        margin-top: 10px;
 
         margin-right: 240px;
 
       }
 
       .autograph{
 
-    margin-top: 20px;
 
+    margin-top: 10px;
 
      }
 
       .bottom-row3 {
 
         margin: 10px 0;
 
@@ -69,12 +69,14 @@
 
 
       .title {
 
         text-align: center;
 
-        font-size: 24px;
 
+        font-size: 36px;
 
+        font-weight: 500;
 
       }
 
 
       .number {
 
         text-align: right;
 
         margin-bottom: 10px;
 
+        margin-top: 20px;
 
       }
 
 
       .small-row {
 
@@ -120,7 +122,8 @@
 
   <body>
 
     <div id="app">
 
       <div class="content" v-if="bigContent">
 
-        <div class="title">粮食检斤单</div>
 
+        <div class="title">{{tableData.compName}}粮食检斤单</div>
 
+        <div class="title">入库检斤单</div>
 
         <div class="number">{{tableData.number}}</div>
 
         <table class="table">
 
           <tr class="row">
 
@@ -156,7 +159,8 @@
 
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
 
             <td class="col col-bgc">热损伤（%）</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
 
-            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
 
+            <td class="col col-bgc" colspan="1">质检时间</td>
 
+            <td class="col" colspan="1">{{tableData.qualityInspectionManagement.qualityDate}}</td>
 
           </tr>
 
           <tr class="row">
 
             <td class="col col-bgc">杂质（%）</td>

+ 14 - 7
src/views/houseSelfCollect/inspectInfo.vue
Zobrazit soubor 

@@ -567,14 +567,17 @@
 
         }
 
         this.inspect.warehouseName = this.warehouseName
 
         this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
 
-        this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
 
         if (this.types == 1) {
 
+          this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
 
           this.$confirm('确定保存质检信息？', '提示', {
 
               confirmButtonText: '确定',
 
               cancelButtonText: '取消',
 
               type: 'warning',
 
             })
 
             .then(() => {
 
+              if(!this.inspect.tidalGrainPrice||this.inspect.tidalGrainPrice=='NaN'){
 
+                this.inspect.tidalGrainPrice = 0
 
+              }
 
               inspectAdd(this.inspect)
 
                 .toPromise()
 
                 .then((response) => {
 
@@ -595,6 +598,7 @@
 
               return false
 
             })
 
         } else if (this.types == 3) {
 
+          this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
 
           this.inspect.flag=0
 
           this.$confirm('确定保存初检信息？', '提示', {
 
               confirmButtonText: '确定',
 
@@ -636,7 +640,7 @@
 
             })
 
         }else if (this.types == 5) {
 
           this.inspect.flag=2
 
-          this.inspect.reInspector=sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
 
+          // this.inspect.reInspector=sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
 
           this.$confirm('确定保存质检信息？', '提示', {
 
               confirmButtonText: '确定',
 
               cancelButtonText: '取消',
 
@@ -709,11 +713,14 @@
 
 
       waterContentChange(type) {
 
         if (this.inspect.goodsName&&type!='water') {
 
-          getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
 
-          .toPromise()
 
-          .then((response) => { 
-            this.$set(this.inspect,'dryGrainPrice',response)
 
-          })
 
+          if(!this.inspect.dryGrainPrice||this.inspect.dryGrainPrice == 0){
 
+            getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
 
+            .toPromise()
 
+            .then((response) => { 
+              this.$set(this.inspect,'dryGrainPrice',response)
 
+            })
 
+          }
 
+          
           for (var i = 0; i < this.purchasePriceList.length; i++) {
 
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
 
               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)

+ 3 - 3
src/views/houseSelfCollect/inspectionManagement.vue
Zobrazit soubor 

@@ -95,16 +95,16 @@
 
       </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 prop="qualityInspector" label="质检员" width="100px">
 
           <template scope="scope">
 
             <span>{{scope.row.qualityInspector}}</span>
 
-            <span v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">{{scope.row.reInspector}}</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="updateDate" label="质检时间"  width="90px"></el-table-column>
 
       <el-table-column prop="status" label="状态">
 
         <template slot-scope="scope">
 
           <span v-if='scope.row.confirm=="1"'>

+ 1 - 1
src/views/houseSelfCollect/settlement.vue
Zobrazit soubor 

@@ -69,7 +69,7 @@
 
                 <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" />
 
+                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" disabled 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 />

+ 2 - 1
src/views/houseSelfCollect/weighingManagement.vue
Zobrazit soubor 

@@ -166,7 +166,7 @@ export default {
 
         qualityInspectionManagement:{},
 
       },
 
       purchasePriceList:[],
 
-      allowEdit:'',
 
+      allowEdit:false,
 
       disabled:false
 
     }
 
   },
 
@@ -275,6 +275,7 @@ export default {
 
             this.warehouseId=_wareHouse.id
 
              this.warehouseNo =_wareHouse.commonWarehouseNo
 
              this.monitorUrl1=_wareHouse.monitorUrl1
 
+              this.allowEdit = _wareHouse.allowEdit
 
              this.monitorUrl2=_wareHouse.monitorUrl2
 
           } else {
 
             if (this.cangid&&this.cangid == response[i].id) {

+ 10 - 4
src/views/houseSelfCollect/weightCheck.vue
Zobrazit soubor 

@@ -195,7 +195,7 @@
 
           buckleMiscellaneous: 0,
 
         },
 
         tpyeNo: '',
 
-        disabled: false,
 
+        disabled: true,
 
         relationId: '',
 
         warehouseId: '',
 
         purchasePriceList: [],
 
@@ -229,7 +229,9 @@
 
       if (!this.$route.query.grossWeight) {
 
         this.$route.query.grossWeight = 0
 
       }
 
-      this.weighingList.grossWeight = this.$route.query.grossWeight
 
+      else{
 
+        this.weighingList.grossWeight = this.$route.query.grossWeight
 
+      }
 
       // this.purchasePriceList = this.$route.query.purchasePriceList
 
       // console.log(this.purchasePriceList, '上限')
 
       this.allowEdit = this.$route.query.allowEdit
 
@@ -420,9 +422,13 @@
 
               }
 
             }
 
             if (this.tpyeNo != 2) {
 
-              this.weighingList.grossWeight = parseInt(result)
 
+              if(parseInt(result)){
 
+                this.weighingList.grossWeight = parseInt(result)
 
+              }
 
             } else {
 
-              this.weighingList.tare = parseInt(result)
 
+              if(parseInt(result)){
 
+                this.weighingList.tare = parseInt(result)
 
+              }
 
             }
 
             setTimeout(1000)
 
             // value 是一个 Uint8Array

+ 1 - 1
vue.config.js
Zobrazit soubor 

@@ -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.107:8090/',
 
+        target: 'http://192.168.1.122:9100/',
 
         // target: 'http://192.168.1.119:8090/',
 
         // target: 'http://192.168.24.5:8098',//目标地址
 
         // target: 'http://product-server.winsea.com/',