|  | @@ -247,58 +247,16 @@
 | 
	
		
			
				|  |  |          :fixed="item.fixed"
 | 
	
		
			
				|  |  |          :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  |          sortable
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <!-- <el-table-column
 | 
	
		
			
				|  |  | -        label="编号"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fNo"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | -        label="名称"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fName"
 | 
	
		
			
				|  |  | -        width="120"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | -        label="英文名称"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fEnam"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | -        label="商品类别"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fTypeid"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -        :formatter="fTypeidFormat"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | -        label="规格"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fSpecs"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | -        label="包装规格"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fPackagespecs"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | -        label="颜色"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fColor"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | -        label="海关编码"
 | 
	
		
			
				|  |  | -        align="center"
 | 
	
		
			
				|  |  | -        prop="fHscode"
 | 
	
		
			
				|  |  | -        :show-overflow-tooltip="true"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -      <el-table-column label="包装类型" align="center" prop="fPackageid" /> -->
 | 
	
		
			
				|  |  | +      >
 | 
	
		
			
				|  |  | +        <template slot-scope="scope">
 | 
	
		
			
				|  |  | +          <span v-if="item.label == 'ifCntrno'">
 | 
	
		
			
				|  |  | +            
 | 
	
		
			
				|  |  | +            <span v-if="scope.row.ifCntrno=='1'">是</span>
 | 
	
		
			
				|  |  | +            <span v-else>否</span>
 | 
	
		
			
				|  |  | +          </span>
 | 
	
		
			
				|  |  | +          <span v-else>{{ scope.row[item.label] }}</span>
 | 
	
		
			
				|  |  | +        </template>
 | 
	
		
			
				|  |  | +      </el-table-column>
 | 
	
		
			
				|  |  |        <el-table-column label="状态" align="center" prop="fStatus">
 | 
	
		
			
				|  |  |          <template slot-scope="scope">
 | 
	
		
			
				|  |  |            <el-switch
 | 
	
	
		
			
				|  | @@ -712,6 +670,13 @@ export default {
 | 
	
		
			
				|  |  |            checked: 0,
 | 
	
		
			
				|  |  |            width: 100,
 | 
	
		
			
				|  |  |          },
 | 
	
		
			
				|  |  | +        {
 | 
	
		
			
				|  |  | +          surface: "10",
 | 
	
		
			
				|  |  | +          label: "ifCntrno",
 | 
	
		
			
				|  |  | +          name: "是否按照箱号统计",
 | 
	
		
			
				|  |  | +          checked: 0,
 | 
	
		
			
				|  |  | +          width: 150,
 | 
	
		
			
				|  |  | +        },
 | 
	
		
			
				|  |  |        ],
 | 
	
		
			
				|  |  |        allCheck: false,
 | 
	
		
			
				|  |  |      };
 |