Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/productionPlan/index.vue

@@ -244,7 +244,12 @@
           <el-link
             type="primary"
             :underline="false"
-            v-if="row.approvalStatus != 1 && row.approvalStatus != 2"
+            v-if="
+              row.status == 2 &&
+              row.splitBatch != 1 &&
+              row.approvalStatus != 1 &&
+              row.approvalStatus != 2
+            "
             @click="handleOrderPublish(1, row)"
           >
             发布

src/views/workOrder/mixins/release.js

@@ -111,7 +111,7 @@ export default {
           if (userData.centerList.length == 0) {
             this.form.isDisable = true;
             return this.$message.warning(
-              `当前登录人没有配置所中心，请先去主数据给该登录人配置所属中心`
+              `当前登录人没有配置所属中心，请先去主数据给该登录人配置所属中心`
             );
           }