|  | @@ -898,8 +898,8 @@
 | 
	
		
			
				|  |  |                </el-col>
 | 
	
		
			
				|  |  |              </el-row>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  | -          <el-col :span="8"> 
 | 
	
		
			
				|  |  | -               <el-form-item>
 | 
	
		
			
				|  |  | +          <el-col :span="8">
 | 
	
		
			
				|  |  | +            <el-form-item>
 | 
	
		
			
				|  |  |                <el-table
 | 
	
		
			
				|  |  |                  :data="CntrTable"
 | 
	
		
			
				|  |  |                  style="width: 80%"
 | 
	
	
		
			
				|  | @@ -949,8 +949,7 @@
 | 
	
		
			
				|  |  |                        type="text"
 | 
	
		
			
				|  |  |                        @click.native.prevent="deleteRow(scope.$index, CntrTable)"
 | 
	
		
			
				|  |  |                        icon="el-icon-delete"
 | 
	
		
			
				|  |  | -                      ></el-button
 | 
	
		
			
				|  |  | -                    >
 | 
	
		
			
				|  |  | +                    ></el-button>
 | 
	
		
			
				|  |  |                    </template>
 | 
	
		
			
				|  |  |                  </el-table-column>
 | 
	
		
			
				|  |  |                </el-table>
 | 
	
	
		
			
				|  | @@ -4326,7 +4325,7 @@ export default {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    methods: {
 | 
	
		
			
				|  |  | -      addRow() {
 | 
	
		
			
				|  |  | +    addRow() {
 | 
	
		
			
				|  |  |        var obj = {};
 | 
	
		
			
				|  |  |        this.CntrTable.push(obj);
 | 
	
		
			
				|  |  |      },
 | 
	
	
		
			
				|  | @@ -4482,7 +4481,7 @@ export default {
 | 
	
		
			
				|  |  |                  return prev;
 | 
	
		
			
				|  |  |                }
 | 
	
		
			
				|  |  |              }, 0);
 | 
	
		
			
				|  |  | -            if (index === 13 ||index===14) {
 | 
	
		
			
				|  |  | +            if (index === 13 || index === 14) {
 | 
	
		
			
				|  |  |                sums[index] = (sums[index] / 1000).toFixed(2) + "(吨)";
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              if (index === 12) {
 | 
	
	
		
			
				|  | @@ -5765,6 +5764,7 @@ export default {
 | 
	
		
			
				|  |  |              this.form = response.data.warehousebills;
 | 
	
		
			
				|  |  |              this.form.fProductName = "";
 | 
	
		
			
				|  |  |              this.form.fMarks = "";
 | 
	
		
			
				|  |  | +            this.form.fMblno = "";
 | 
	
		
			
				|  |  |              queryUserVal().then((response) => {
 | 
	
		
			
				|  |  |                this.current = response.user.userName;
 | 
	
		
			
				|  |  |                this.form.fStorekeeper = response.user.nickName;
 | 
	
	
		
			
				|  | @@ -5790,9 +5790,6 @@ export default {
 | 
	
		
			
				|  |  |              this.$set(this.form, "fBillno", null);
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            if (response.data.warehouseBillsItem) {
 | 
	
		
			
				|  |  | -            if(response.data.warehouseBillsItem.length>0){
 | 
	
		
			
				|  |  | -              this.form.fMblno=""
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  |              this.dataList = [];
 | 
	
		
			
				|  |  |              for (let list in this.dataList) {
 | 
	
		
			
				|  |  |                this.$set(this.dataList[list], "fBillstatus", 10);
 | 
	
	
		
			
				|  | @@ -5909,6 +5906,10 @@ export default {
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            if (response.data.warehouseBillsItem) {
 | 
	
		
			
				|  |  |              this.dataList = response.data.warehouseBillsItem;
 | 
	
		
			
				|  |  | +            if (!this.dataList.length) {
 | 
	
		
			
				|  |  | +              this.form.fProductName = "";
 | 
	
		
			
				|  |  | +              this.form.fMarks = "";
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  |              for (let list in this.dataList) {
 | 
	
		
			
				|  |  |                this.$set(
 | 
	
		
			
				|  |  |                  this.dataList[list],
 | 
	
	
		
			
				|  | @@ -6814,6 +6815,10 @@ export default {
 | 
	
		
			
				|  |  |          //   }
 | 
	
		
			
				|  |  |          // }
 | 
	
		
			
				|  |  |          if (valid) {
 | 
	
		
			
				|  |  | +          if (!this.dataList.length) {
 | 
	
		
			
				|  |  | +            this.form.fProductName = "";
 | 
	
		
			
				|  |  | +            this.form.fMarks = "";
 | 
	
		
			
				|  |  | +          }
 | 
	
		
			
				|  |  |            this.form.fNetweight = this.fNetweight;
 | 
	
		
			
				|  |  |            this.form.fGrossweight = this.fGrossweight;
 | 
	
		
			
				|  |  |            this.form.fQty = this.fQty;
 | 
	
	
		
			
				|  | @@ -7173,6 +7178,8 @@ export default {
 | 
	
		
			
				|  |  |      deleteRow(index, rows) {
 | 
	
		
			
				|  |  |        rows.splice(index, 1);
 | 
	
		
			
				|  |  |        if (this.dataList.length === 0) {
 | 
	
		
			
				|  |  | +        this.form.fProductName = "";
 | 
	
		
			
				|  |  | +        this.form.fMarks= "";
 | 
	
		
			
				|  |  |          this.formBrowseStatus = false;
 | 
	
		
			
				|  |  |          this.contrOl = false;
 | 
	
		
			
				|  |  |          return false;
 | 
	
	
		
			
				|  | @@ -7183,10 +7190,6 @@ export default {
 | 
	
		
			
				|  |  |            return false;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      if(this.dataList.length==0){
 | 
	
		
			
				|  |  | -        this.form.fProductName = "";
 | 
	
		
			
				|  |  | -        this.form.fMarks = "";
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /* 远程模糊查询用户 */
 | 
	
		
			
				|  |  |      corpsRemoteMethod(name) {
 |