update docs_0825

src/views/modules/pms/carOrderReport/config.js

@@ -1,7 +1,7 @@
 import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
 // import switchBtn from "@/components/noTemplateComponents/switchBtn";
-import QuillRichInput from "@/components/noTemplateComponents/richInput";
-import request from "@/utils/request";
+// import QuillRichInput from "@/components/noTemplateComponents/richInput";
+// import request from "@/utils/request";
 import { timeFilter } from "@/utils/filters";
 
 export default function () {
@@ -10,11 +10,12 @@ export default function () {
     { type: "selection", width: 60, align: "center" },
     { width: 128, prop: "createTime", label: "添加时间", filter: timeFilter },
     { width: 128, prop: "updaterName", label: "更改人" },
-    { width: 128, prop: "code", label: "窑车号" },
+    { width: 128, prop: "posCode", label: "位置" },
+    { width: 72, prop: "code", label: "窑车号" },
     { width: 128, prop: "orderCode", label: "订单号" },
-    { width: 128, prop: "orderCate", label: "订单子号" },
-    { width: 128, prop: "shapeCode", label: "砖型" },
-    { width: 128, prop: "brand", label: "配方" },
+    { width: 88, prop: "orderCate", label: "订单子号" },
+    { width: 72, prop: "shapeCode", label: "砖型" },
+    { width: 256, prop: "brand", label: "配方" },
     { width: 128, prop: "goodqty", label: "合格数量" },
     { width: 128, prop: "badqty", label: "报废数量" },
     // { prop: "typeDictValue", label: "过渡车", filter: val => ['否', '是'][val] },
@@ -39,7 +40,7 @@ export default function () {
       width: 90,
       subcomponent: TableOperaionComponent,
       options: [
-        { name: "edit", label: "编辑", icon: "edit-outline", enable: row => row.report == 0 },
+        { name: "edit", label: "编辑", icon: "edit-outline", enable: (row) => row.report == 0 },
         // {
         //   name: "delete",
         //   icon: "delete",
@@ -81,7 +82,7 @@ export default function () {
       ],
       default: { value: "" },
       bind: {
-        placeholder: "请输入班次",
+        placeholder: "请选择班次",
       },
     },
     {
@@ -93,7 +94,18 @@ export default function () {
       ],
       default: { value: "0" },
       bind: {
-        placeholder: "请输入报工状态",
+        placeholder: "请选择报工状态",
+      },
+    },
+    {
+      prop: "pos",
+      label: "压机",
+      select: [
+        { label: "压机1", value: "1" },
+        { label: "压机2", value: "7" },
+      ],
+      bind: {
+        placeholder: "请选择压机",
       },
     },
     {
@@ -239,8 +251,8 @@ export default function () {
       base: "/pms/carOrderReport",
       page: "/pms/carOrderReport/pageView",
       pageIsPostApi: true,
-      reportPre: '/pms/workReport/pressReportPre',
-      report: '/pms/workReport/pressReport',
+      reportPre: "/pms/workReport/pressReportPre",
+      report: "/pms/workReport/pressReport",
     },
   };
 }

src/views/modules/pms/carOrderReport/index.vue

@@ -28,7 +28,6 @@ export default {
       dialogConfigs,
     };
   },
-
   computed: {
     now() {
       const curr = this.headFormConfigs.fields.find((item) => item.prop == "timerange").default.value;
@@ -36,12 +35,6 @@ export default {
         moment(curr[0]).format("YYYY-MM-DDTHH:mm:ss"),
         moment(curr[1]).format("YYYY-MM-DDTHH:mm:ss"),
       ]
-      // const start = new Date(curr[0]);
-      // const end = new Date(curr[1]);
-      // return [
-      // start.toLocaleString().replace(' ', 'T').replace(/\//g, '-'),
-      // end.toLocaleString().replace(' ', 'T').replace(/\//g, '-'),
-      // ]
     },
   },
   methods: {},

src/views/modules/pms/pallet/config.js

@@ -167,6 +167,7 @@ export default function () {
     tableConfig: {
       table: null, // 此处可省略，el-table 上的配置项
       column: tableProps, // el-column-item 上的配置项
+      selectProps: ['id', 'orderCode']
     },
     headFormConfigs: {
       rules: null, // 名称是由 BaseSearchForm.vue 组件固定的