홈 탐색 도움말
가입하기 로그인
gdc
/
yiliangyiyun-pc
1
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

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

gjy 2 년 전
부모
c57217974f d6c210c243
커밋
65b8e9199e
4개의 변경된 파일과 164개의 추가작업 그리고 130개의 파일을 삭제
분할 보기 변경상태 보기
  1. 117 116
      public/static/print.html
  2. 4 0
      src/views/houseSelfCollect/acquisitionManagement.vue
  3. 22 13
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  4. 21 1
      src/views/houseSelfCollect/inspectionManagementNew.vue

+ 117 - 116
public/static/print.html
파일 보기 

@@ -150,126 +150,13 @@
 
 
   <body>
 
     <div id="app">
 
-      <div class="content" :class="'content'+index" v-for="(item,index) in 4" v-if="!type">
 
+      <div class="content" :class="content" v-if="type == 1"><!--容重打印-->
 
         <div class="title">
 
-          <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
 
+          <div class="name">{{name}}价格对照表（按容重）</div>
 
           <div class="price">价格单位：元/公斤</div>
 
         </div>
 
         <div class="table-row">
 
-          <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-            </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData2" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData3" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData4" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData5" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData6" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-             </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData7" :row-class-name="tableRowClassName" class="tableBox tableBox7">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-             </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-        </div>
 
-
 
-      </div>
 
-      <div class="content" :class="'content'+index" v-for="(item,index) in 4" v-if="!type"><!--容重打印-->
 
-        <div class="title">
 
-          <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="price">价格单位：元/公斤</div>
 
-        </div>
 
-        <div class="table-row">
 
-          <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
 
+          <el-table :data="tableData" :row-class-name="tableRowClassName" >
 
             <el-table-column prop="bulkDensityMax" label="容重上限" header-align="center">
 
             </el-table-column>
 
             <el-table-column prop="bulkDensityMin" label="容重下限" header-align="center">
 
@@ -280,6 +167,118 @@
 
         </div>
 
       </div>
 
 
+      <div v-else>
 
+        <div class="content" :class="'content'+index" v-for="(item,index) in 4" >
 
+          <div class="title">
 
+            <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="price">价格单位：元/公斤</div>
 
+          </div>
 
+          <div class="table-row">
 
+            <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+              </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData2" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData3" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData4" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData5" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData6" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+               </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData7" :row-class-name="tableRowClassName" class="tableBox tableBox7">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+               </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
@@ -330,7 +329,9 @@
 
         let _data = localStorage.getItem("pricePrintList")
 
         this.name = decodeURIComponent(this.getQueryVariable("name"))
 
         this.type = decodeURIComponent(this.getQueryVariable("type"))
 
+        console.log(this.type)
 
         console.log(_data)
 
+        this.$forceUpdate()
 
         this.tableData = JSON.parse(_data)
 
         // 构造显示数据
 
         this.waterMin = this.tableData[0].waterMin

+ 4 - 0
src/views/houseSelfCollect/acquisitionManagement.vue
파일 보기 

@@ -303,7 +303,11 @@
 
               'pricePrintList',
 
               JSON.stringify(response.detailPrints)
 
             )
 
+            if(response.bulkDensityStandard == 1){
 
+              window.open('../../../static/print.html?name=' + row.goodsName+"&type=" + 1)
 
+            }else{
 
             window.open('../../../static/print.html?name=' + row.goodsName)
 
+            }
 
           })
 
       },
 
       validate() {}

+ 22 - 13
src/views/houseSelfCollect/acquisitionManagementAdd.vue
파일 보기 

@@ -197,9 +197,9 @@
 
           {{selectVal}}价格对照表（按容重）
 
         </div>
 
         <el-table :data="tableData1" style="width: 100%" :row-class-name="tableRowClassName">
 
-          <el-table-column prop="bulkDensityMin" label="容重下限">
 
+           <el-table-column prop="bulkDensityMax" label="容重上限">
 
           </el-table-column>
 
-          <el-table-column prop="bulkDensityMax" label="容重上限">
 
+          <el-table-column prop="bulkDensityMin" label="容重下限">
 
           </el-table-column>
 
           <el-table-column prop="bulkDensityPrice" label="容重单价">
 
           </el-table-column>
 
@@ -360,7 +360,7 @@ export default {
 
         if (_goodsNameList.length == 0) {
 
           this.goodnameList = response
 
           this.selectVal = response[0].constValue
 
-          if (
 
+          if (this.selectVal == '玉米淀粉' ||
 
             this.selectVal == '玉米（机收）' ||
 
             this.selectVal == '玉米（酒精）' ||
 
             this.selectVal == '玉米（筛漏）' ||
 
@@ -379,13 +379,20 @@ export default {
 
           this.goodnameList = _list
 
           if (_list.length != 0) {
 
             this.selectVal = _list[0].constValue
 
-            if (this.selectVal == '玉米（潮粮）') {
 
-              this.isSolidFood = false
 
-              this.baseInfoForm.bulkDensityStandard = ''
 
-            } else {
 
-              this.isSolidFood = true
 
-              this.baseInfoForm.bulkDensityStandard = 1
 
-            }
 
+            if (this.selectVal == '玉米淀粉' ||
 
+            this.selectVal == '玉米（机收）' ||
 
+            this.selectVal == '玉米（酒精）' ||
 
+            this.selectVal == '玉米（筛漏）' ||
 
+            this.selectVal == '玉米（陈粮）' ||
 
+            this.selectVal == '玉米（棒）' ||
 
+            this.selectVal == '玉米'
 
+          ) {
 
+            this.isSolidFood = true
 
+            this.baseInfoForm.bulkDensityStandard = 1
 
+          } else {
 
+            this.isSolidFood = false
 
+            this.baseInfoForm.bulkDensityStandard = ''
 
+          }
 
             this.baseInfoForm.goodsNameKey = _list[0].constKey
 
           }
 
         }
 
@@ -532,7 +539,7 @@ export default {
 
         })
 
     },
 
     goodsChange(e) {
 
-      if (
 
+      if ( e == '玉米淀粉' ||
 
         e == '玉米（机收）' ||
 
         e == '玉米（酒精）' ||
 
         e == '玉米（筛漏）' ||
 
@@ -1237,7 +1244,6 @@ export default {
 
     },
 
     // 提交
 
     submit() {
 
-      debugger
 
       let isValidate = false
 
       isValidate = this.validate()
 
 
@@ -1262,7 +1268,10 @@ export default {
 
             }
 
             break
 
           case '编辑':
 
-            this.getEditCheckList()
 
+             if (!this.baseInfoForm.bulkDensityStandard) {
 
+              //以水分计算等级
 
+              this.getEditCheckList()
 
+            }
 
             isValidate = this.validate()
 
             if (isValidate) {
 
               purchasePriceEdit(this.baseInfoForm)

+ 21 - 1
src/views/houseSelfCollect/inspectionManagementNew.vue
파일 보기 

@@ -367,7 +367,7 @@
 
                 </ws-form-item>
 
                 <!--容重(克/升)-->
 
                 <ws-form-item :label="deptBudgetList.goodsName!='大豆'?'容重(克/升)':'蛋白'" span="1" prop="bulkDensity">
 
-                  <ws-input v-if='statusTypetext != "复检"'
 
+                  <ws-input v-if='statusTypetext != "复检"' @change="obtainPrice()"
 
                     v-model="deptBudgetList.bulkDensity" type="number" @mousewheel.native.prevent :placeholder="deptBudgetList.goodsName!='大豆'?'请输入容重':'请输入蛋白'"
 
                     maxlength="40" size="small" />
 
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
 
@@ -1016,16 +1016,36 @@ export default {
 
                       this.$set(this.deptBudgetList, 'dryGrainPrice', response)
 
                     })
 
                 } else {
 
+                  if(response>0){
 
                   this.deptBudgetList.dryGrainPrice = response
 
+                  }
 
                 }
 
               } else {
 
+                if(response>0){
 
                 this.deptBudgetList.tidalGrainPrice = response
 
+                  
+                }
 
               }
 
             }
 
           })
 
       }
 
       if (this.deptBudgetList.goodsName && this.deptBudgetList.customerName) { }
 
     },
 
+    obtainPrice(){
 
+      getinspectLookUnitPrice({
 
+          warehouseId: this.cangid,
 
+          goodsName: this.deptBudgetList.goodsName,
 
+          bulkDensity: this.deptBudgetList.bulkDensity,
 
+        })
 
+          .toPromise()
 
+          .then((response) => {
 
+            if(response){
 
+             this.deptBudgetList.dryGrainPrice = response
 
+            }
 
+
 
+          })
 
+
 
+    },
 
     opendBtn() {
 
       html2canvas(this.$refs.saveImg.$el).then(canvas => {
 
         let dataURL = canvas.toDataURL('image/png');