1

src/views/JXSK/mes/forward/add.vue

@@ -52,7 +52,7 @@ const formOption = reactive({
   labelWidth: "62pk",
   submitBtnText: proxy.t("common.submit"),
   otherBtn: true,
-  otherBtnText: "退回",
+  otherBtnText: "退回任务池",
   btnConfig: {
     isNeed: false,
     prop: "list",
@@ -163,6 +163,13 @@ const configData = [
     },
     {
       type: "input",
+      itemType: "textarea",
+      label: "产品备注",
+      prop: "productRemark",
+      readonly: true,
+    },
+    {
+      type: "input",
       itemType: "text",
       label: proxy.t("forward.currentProcess"),
       prop: "productionProcessesName",
@@ -214,6 +221,13 @@ const configData = [
     },
     {
       type: "input",
+      itemType: "textarea",
+      label: "产品备注",
+      prop: "productRemark",
+      readonly: true,
+    },
+    {
+      type: "input",
       itemType: "text",
       label: proxy.t("forward.currentProcess"),
       prop: "productionProcessesName",

src/views/JXSK/mes/receive/add.vue

@@ -56,7 +56,7 @@ const formOption = reactive({
   labelWidth: "62pk",
   submitBtnText: proxy.t("receive.confirmReceipt"),
   otherBtn: true,
-  otherBtnText: proxy.t("receive.return"),
+  otherBtnText: "退回前道工序",
   btnConfig: {
     isNeed: false,
     prop: "list",
@@ -83,6 +83,13 @@ const formConfig = reactive([
   },
   {
     type: "input",
+    itemType: "textarea",
+    label: "产品备注",
+    prop: "productRemark",
+    readonly: true,
+  },
+  {
+    type: "input",
     itemType: "text",
     label: "当前工序",
     prop: "productionProcessesName",
@@ -197,7 +204,10 @@ onMounted(() => {
   if (route.query.id) {
     formData.data = { ...route.query };
     getDetails();
-    if (!formData.data.personLiableId) {
+    if (
+      !formData.data.previousProcessesId ||
+      formData.data.previousProcessesId == -1
+    ) {
       formOption.otherBtn = false;
     }
   }

src/views/JXSK/mes/task/add.vue

@@ -236,7 +236,7 @@ const getDict = () => {
       formConfig[0].data = res.data.rows.map((item) => {
         return {
           ...item,
-          label: item.code,
+          label: item.code + `（${item.startDate}-${item.stopDate}）`,
           value: item.id,
         };
       });
@@ -263,6 +263,9 @@ const getDict = () => {
 
 const onClickLeft = () => history.back();
 const onSubmit = () => {
+  if (Number(formData.data.quantity) == 0) {
+    return showFailToast("任务数量不能为0");
+  }
   if (Number(formData.data.quantity) > Number(formData.data.waitQuantity)) {
     return showFailToast(
       proxy.t("task.taskQuantityCanNotBeGreaterThanTheScheduledQuantity")

src/views/JXSK/salesContract/add.vue

@@ -166,7 +166,7 @@ const formOption = reactive({
       },
       {
         type: "input",
-        itemType: "text",
+        itemType: "textarea",
         label: "备注",
         prop: "productRemark",
       },

src/views/MES/produce/plan/add.vue

@@ -191,6 +191,9 @@ const onConfirmTime = ({ selectdValues, selectedOptions }) => {
 const onClickLeft = () => history.back();
 
 const onSubmit = () => {
+  if (Number(formData.value.quantity) == 0) {
+    return showFailToast("计划数量不能为0");
+  }
   if (Number(formData.value.quantity) > Number(formData.value.waitQuantity)) {
     return showFailToast(
       proxy.t("plan.planQuantityCanNotBeGreaterThanTheSchedulingQuantity")