Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/business/platform/data/templatebuilder/right-aside/components/export-column.vue

@@ -166,9 +166,13 @@ export default {
     },
     data: {
       handler: function(val, oldVal) {
+        const arr = this.datasets.filter(d => d.parentId !== '0')
         if (!val) return
+        // 当未设置导出字段或已设置导出字段但是字段数量与数据集字段不等时（说明表中有新增字段），重新获取导出字段
         if (this.$utils.isEmpty(val.export_columns)) {
           this.exportColumns.fields = this.initFormData(this.datasets)
+        } else if (val.export_columns.fields && (val.export_columns.fields.length !== arr.length)) {
+          this.exportColumns.fields = this.initFormData(this.datasets)
         } else {
           this.exportColumns = val.export_columns
         }

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -171,12 +171,15 @@
                          <el-table-column
                            prop="shi_fou_liu_yang_"
                            label="是否留样"
-                           width="100px">
+                           width="100px"
+                           fixed="right"
+                           align="center">
                          </el-table-column>
 
                          <el-table-column
                            label="样品存放位置"
-                           width="230px"
+                           width="200px"
+                           fixed="right"
                            >
                             <template slot-scope="scope">
                               <!-- <ibps-link-data
@@ -189,7 +192,8 @@
 
                          <el-table-column
                            label="留样存放位置"
-                           width="230px">
+                           width="200px"
+                           fixed="right">
                             <template slot-scope="scope">
                               <!-- <ibps-link-data
                                 v-model="scope.row.liu_yang_wei_zhi_"
@@ -202,7 +206,8 @@
                         
                          <el-table-column
                            label="接样确认状态"
-                           width="230px">
+                           width="130px"
+                           fixed="right">
                             <template slot-scope="scope">
                                 <el-select v-model="scope.row.jie_yang_zhuang_t" placeholder="请选择">
                                   <el-option
@@ -217,7 +222,7 @@
 
                          </el-table-column>
 
-                         <el-table-column label="功能">
+                         <el-table-column label="功能"  fixed="right">
                                  <template slot-scope="scope">
                                      <el-button
                                        size="small"

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -169,12 +169,14 @@
                          <el-table-column
                            prop="shi_fou_liu_yang_"
                            label="是否留样"
-                           width="100px">
+                           width="100px"
+                           align="center">
                          </el-table-column>
 
                          <el-table-column
                            label="样品存放位置"
-                           width="230px"
+                           width="200px"
+                           fixed="right"
                            >
                             <template slot-scope="scope">
                               <!-- <ibps-link-data
@@ -188,7 +190,8 @@
                                 store="id" -->
                          <el-table-column
                            label="留样存放位置"
-                           width="230px">
+                           width="200px"
+                           fixed="right">
                             <template slot-scope="scope">
                               <!-- <ibps-link-data
                                 v-model="scope.row.liu_yang_wei_zhi_"
@@ -202,7 +205,8 @@
                                            
                          <el-table-column
                            label="接样确认状态"
-                           width="230px">
+                           width="130px"
+                           fixed="right">
                             <template slot-scope="scope">
                                 <el-select v-model="scope.row.jie_yang_zhuang_t" placeholder="请选择">
                                   <el-option
@@ -217,7 +221,8 @@
 
                          </el-table-column>
 
-                         <el-table-column label="功能">
+                         <el-table-column label="功能"
+                           fixed="right">
                                  <template slot-scope="scope">
                                      <el-button
                                        size="small"

src/views/system/jbdScan/goods/sampleTag.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bg">
     <el-dialog 
-      width="21cm"
+      width="11cm"
       height="10cm" 
        :modal-append-to-body='true' :append-to-body="true" title="样品标签" :visible.sync="scanVisible">
       <!-- 表单是否显示 -->
@@ -363,6 +363,6 @@ export default {
 
 }
 .All{
-  
+  text-align: center
 }
 </style>