瀏覽代碼

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

# Conflicts:
#	src/views/houseSelfCollect/weightCheck.vue
ccj 3 年之前
父節點
當前提交
e665f49423
共有 1 個文件被更改,包括 5 次插入5 次删除
  1. 5 5
      src/views/houseSelfCollect/weightCheck.vue

+ 5 - 5
src/views/houseSelfCollect/weightCheck.vue

@@ -193,7 +193,6 @@
     highlight-current-row
     @current-change="handleCurrentChange"
     style="width: 100%">
-    </el-table-column>
     <el-table-column
       property="number"
       label="编号"
@@ -421,7 +420,8 @@ export default {
               result += tmp
             }
           }
-          if(this.tpyeNo != 2){
+          // if(this.tpyeNo != 2)
+          if(this.information != '皮重'){
             this.weighingList.grossWeight = parseInt(result)
           }
           else{
@@ -508,7 +508,7 @@ export default {
         })
         return
       }
-      if (this.tpyeNo == 2) {
+      if (this.information = "皮重") {
         if (!this.weighingList.tare) {
           this.$message({
             message: '皮重不能为空',
@@ -564,7 +564,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          if (this.tpyeNo == 1) {
+          if (this.information = "毛重") {
             //毛检保存前进行校验
             getamount({
               compId: sessionStorage.getItem('ws-pf_compId'),
@@ -621,7 +621,7 @@ export default {
                   }
                 }
               })
-          } else if (this.tpyeNo == 2) {
+          } else if (this.information = "皮重") {
             this.weighingList.warehouseId = this.warehouseId
             ;(this.weighingList.skinInspector =
               sessionStorage.getItem('ws-pf_staffName')),