1

src/views/MES/productionReport/add.vue

@@ -246,9 +246,10 @@ const getDetail = () => {
           });
       },
       (err) => {
+        showFailToast("扫码异常");
         setTimeout(() => {
           onClickLeft();
-        }, 1000);
+        }, 2000);
       }
     );
 };

src/views/salesContract/claim/add.vue

@@ -46,6 +46,18 @@ const formOption = reactive({
     plain: true,
     listConfig: [
       {
+        type: "input",
+        itemType: "text",
+        label: "认领时间",
+        prop: "createTime",
+      },
+      {
+        type: "input",
+        itemType: "text",
+        label: "认领人",
+        prop: "claimUserName",
+      },
+      {
         type: "picker",
         label: proxy.t("claim.contractCode"),
         prop: "contractId",
@@ -61,7 +73,7 @@ const formOption = reactive({
       {
         type: "input",
         itemType: "number",
-        label: proxy.t("claim.relatedAmount"),
+        label: "认领金额",
         prop: "money",
       },
     ],
@@ -108,7 +120,7 @@ const formConfig = reactive([
   },
   {
     type: "input",
-    label: proxy.t("claim.accountAmount"),
+    label: "交易金额",
     prop: "currencyMoney",
     itemType: "text",
     readonly: true,
@@ -117,11 +129,9 @@ const formConfig = reactive([
 const onClickLeft = () => history.back();
 const getDict = () => {
   proxy
-    .post("/contract/page", {
+    .post("contract/contractAndSamplePage", {
       pageNum: 1,
       pageSize: 9999,
-      status: "30",
-      refundStatusNew: "0,10",
     })
     .then((res) => {
       formOption.btnConfig.listConfig[0].data = res.data.rows;