Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventor...

zhangwencui

3 天以前 a7484c620e068bec7888f31799fa4d0b2e504140

Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材

 src/views/qualityManagement/metricBinding/index.vue

@@ -6,8 +6,8 @@
      <el-col :xs="24"
              :sm="24"
              :md="12"
              :lg="14"
              :xl="14"
              :lg="12"
              :xl="12"
              class="left-col">
        <div class="panel left-panel">
          <PIMTable rowKey="id"
@@ -82,8 +82,8 @@
      <el-col :xs="24"
              :sm="24"
              :md="12"
              :lg="10"
              :xl="10"
              :lg="12"
              :xl="12"
              class="right-col">
        <div class="panel right-panel">
          <div class="right-header">
@@ -122,6 +122,12 @@
            <el-table-column prop="productName"
                             label="产品名称"
                             min-width="140" />
            <el-table-column prop="materialCode"
                             label="物料编码"
                             min-width="140" />
            <el-table-column prop="model"
                             label="规格型号"
                             min-width="140" />
            <el-table-column label="操作"
                             width="120"
                             fixed="right"