Merge remote-tracking branch 'origin/master'

zkqy-custom-business/src/main/resources/mapper/business/ProductCodeListMapper.xml

@@ -466,7 +466,7 @@
     <select id="selectFinishedProduct" resultType="com.zkqy.business.domain.vo.ProductCodeListVO">
         SELECT
         sp.id as id,
-        sp.lot_number AS lotNum,
+        dp.current_lot_number AS lotNum,
         p.product_name AS productName,
         p.product_specifications AS productSpecifications,
         concat(ml.materie_encoding,ml.materie_color_number) AS productColor,

zkqy-ui/src/lang/zh.js

@@ -2739,7 +2739,7 @@ export default {
     summaryCodeListPrintSuccess: '总码单打印成功!',
     continueComplete: '接续完成,请继续打印',
     columns: {
-      productNo: "编号",
+      productNo: "任务编号",
       productName: "品名",
       productSpecifications: "规格",
       lotNum: "批号",

zkqy-ui/src/views/orderMange/productInRecord/index.vue

@@ -191,42 +191,42 @@
       </el-table-column>
       <el-table-column :label="$t('productInRecord.table.depositor')" align="center" prop="depositor" />
       <!-- <el-table-column label="备注" align="center" prop="remark"/> -->
-      <el-table-column
-        :label="$t('productInRecord.button.operation')"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-dropdown>
-            <el-button type="warning" plain size="small">
-              {{ $t('productInRecord.button.operation') }}<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <!--              <el-dropdown-item>-->
-              <!--                <el-button-->
-              <!--                  size="mini"-->
-              <!--                  type="text"-->
-              <!--                  icon="el-icon-edit"-->
-              <!--                  @click="handleUpdate(scope.row)"-->
-              <!--                  v-hasPermi="['system:ProductWarehousingRecord:edit']"-->
-              <!--                >修改-->
-              <!--                </el-button-->
-              <!--                >-->
-              <!--              </el-dropdown-item>-->
-              <el-dropdown-item>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:ProductWarehousingRecord:remove']"
-                  >{{ $t('productInRecord.button.delete') }}
-                </el-button>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        :label="$t('productInRecord.button.operation')"-->
+<!--        align="center"-->
+<!--        class-name="small-padding fixed-width"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-dropdown>-->
+<!--            <el-button type="warning" plain size="small">-->
+<!--              {{ $t('productInRecord.button.operation') }}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--            </el-button>-->
+<!--            <el-dropdown-menu slot="dropdown">-->
+<!--              &lt;!&ndash;              <el-dropdown-item>&ndash;&gt;-->
+<!--              &lt;!&ndash;                <el-button&ndash;&gt;-->
+<!--              &lt;!&ndash;                  size="mini"&ndash;&gt;-->
+<!--              &lt;!&ndash;                  type="text"&ndash;&gt;-->
+<!--              &lt;!&ndash;                  icon="el-icon-edit"&ndash;&gt;-->
+<!--              &lt;!&ndash;                  @click="handleUpdate(scope.row)"&ndash;&gt;-->
+<!--              &lt;!&ndash;                  v-hasPermi="['system:ProductWarehousingRecord:edit']"&ndash;&gt;-->
+<!--              &lt;!&ndash;                >修改&ndash;&gt;-->
+<!--              &lt;!&ndash;                </el-button&ndash;&gt;-->
+<!--              &lt;!&ndash;                >&ndash;&gt;-->
+<!--              &lt;!&ndash;              </el-dropdown-item>&ndash;&gt;-->
+<!--              <el-dropdown-item>-->
+<!--                <el-button-->
+<!--                  size="mini"-->
+<!--                  type="text"-->
+<!--                  icon="el-icon-delete"-->
+<!--                  @click="handleDelete(scope.row)"-->
+<!--                  v-hasPermi="['system:ProductWarehousingRecord:remove']"-->
+<!--                  >{{ $t('productInRecord.button.delete') }}-->
+<!--                </el-button>-->
+<!--              </el-dropdown-item>-->
+<!--            </el-dropdown-menu>-->
+<!--          </el-dropdown>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination