update carPayloadDialogConfigs

src/views/atomViews/ListViewWithHead.vue

@@ -44,9 +44,9 @@
     />
     <DialogCarPayload
       ref="car-payload-dialog"
-      v-if="!!dialogConfigs && dialogType === DIALOG_CARPAYLOAD"
+      v-if="!!carPayloadDialogConfigs"
-      :dialog-visible.sync="dialogVisible"
+      :dialog-visible.sync="carPayloadDialogVisible"
-      :configs="dialogConfigs"
+      :configs="carPayloadDialogConfigs"
       @refreshDataList="getList"
     />
   </div>
@@ -95,6 +95,10 @@ export default {
       type: Object,
       default: () => null,
     },
+    carPayloadDialogConfigs: {
+      type: Object,
+      default: () => null,
+    },
     triggerUpdate: {
       type: String,
       default: "",
@@ -102,7 +106,7 @@ export default {
   },
   computed: {
     dialogType() {
-      return this.dialogConfigs.menu ? DIALOG_WITH_MENU : this.dialogConfigs.carPayloadDialog ? DIALOG_CARPAYLOAD : DIALOG_JUST_FORM;
+      return this.dialogConfigs.menu ? DIALOG_WITH_MENU : DIALOG_JUST_FORM;
     },
   },
   activated() {
@@ -125,13 +129,14 @@ export default {
       DIALOG_JUST_FORM,
       DIALOG_CARPAYLOAD,
       dialogVisible: false,
+      carPayloadDialogVisible: false,
       topBtnConfig: null,
       totalPage: 100,
       page: 1,
       size: 20, // 默认20
       dataList: [],
       tableLoading: false,
-      refreshLayoutKey: null
+      refreshLayoutKey: null,
     };
   },
   inject: ["urls"],
@@ -426,7 +431,7 @@ export default {
     },
 
     openCarPayloadDialog(id) {
-      this.dialogVisible = true;
+      this.carPayloadDialogVisible = true;
       this.$nextTick(() => {
         this.$refs["car-payload-dialog"].init(id);
       });
@@ -440,6 +445,7 @@ export default {
           break;
 
         case "手动添加": {
+          this.openDialog();
           return;
         }
 

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

@@ -64,7 +64,9 @@ export default function () {
     // },
   ];
 
-  const dialogJustFormConfigs = {
+  const dialogJustFormConfigs = {}
+
+  const carPayloadDialogConfigs = {
     carPayloadDialog: true,
     clickModalToClose: true,
     tableConfig: {
@@ -88,6 +90,7 @@ export default function () {
 
 
   return {
+    carPayloadDialogConfigs,
     dialogConfigs: dialogJustFormConfigs,
     tableConfig: {
       table: null, // 此处可省略，el-table 上的配置项

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

@@ -3,6 +3,7 @@
     :table-config="tableConfig"
     :head-config="headFormConfigs"
     :dialog-configs="dialogConfigs"
+    :car-payload-dialog-configs="carPayloadDialogConfigs"
     :listQueryExtra="[{ code }]"
     attach-list-query-data="code"
     :trigger-update="triggerUpdateKey"
@@ -27,8 +28,9 @@ export default {
     },
   },
   data() {
-    const { tableConfig, headFormConfigs, urls, dialogConfigs } = initConfig.call(this);
+    const { tableConfig, headFormConfigs, carPayloadDialogConfigs, urls, dialogConfigs } = initConfig.call(this);
     return {
+      carPayloadDialogConfigs,
       tableConfig,
       headFormConfigs,
       allUrls: urls,

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

@@ -57,6 +57,11 @@ export default function () {
   ];
 
   const dialogJustFormConfigs = {
+
+  };
+
+
+  const carPayloadDialogConfigs = {
     carPayloadDialog: true,
     clickModalToClose: true,
     tableConfig: {
@@ -78,7 +83,9 @@ export default function () {
     },
   };
 
+
   return {
+    carPayloadDialogConfigs,
     dialogConfigs: dialogJustFormConfigs,
     tableConfig: {
       table: null, // 此处可省略，el-table 上的配置项

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

@@ -7,6 +7,7 @@
       /** { pos: [] } **/
     ]"
     :trigger-update="triggerUpdateKey"
+    :car-payload-dialog-configs="carPayloadDialogConfigs"
   />
 </template>
 
@@ -23,8 +24,9 @@ export default {
     };
   },
   data() {
-    const { tableConfig, headFormConfigs, urls, dialogConfigs } = initConfig.call(this);
+    const { tableConfig, headFormConfigs, urls, carPayloadDialogConfigs, dialogConfigs } = initConfig.call(this);
     return {
+      carPayloadDialogConfigs,
       tableConfig,
       headFormConfigs,
       allUrls: urls,

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

@@ -20,7 +20,8 @@ export default function () {
       width: 90,
       subcomponent: TableOperaionComponent,
       options: [
-        { name: "to-car-payload", label: "装载详情", icon: 'document' }
+        { name: "to-car-payload", label: "装载详情", icon: 'document' },
+        { name: "edit-payload", label: "输入载砖详情", icon: 'edit' },
       ],
     },
   ];
@@ -65,6 +66,41 @@ export default function () {
   ];
 
   const dialogJustFormConfigs = {
+    clickModalToClose: true,
+    form: {
+      rows: [
+        [
+          {
+            input: true,
+            label: "窑车号",
+            prop: "code",
+            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            elparams: { placeholder: "请输入窑车号" },
+          },
+          // {
+          //   input: true,
+          //   label: "编码",
+          //   prop: "code",
+          //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+          //   elparams: { placeholder: "请输入料仓编码" },
+          // },
+        ],
+        // [{ component: QuillRichInput, label: "描述信息", prop: "description" }],
+        [{
+          richInput: true, label: "描述信息", prop: "description"
+        }],
+        [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
+      ],
+      operations: [
+        { name: "add", label: "保存", type: "primary", permission: "pms:car:save", showOnEdit: false },
+        { name: "update", label: "更新", type: "primary", permission: "pms:car:update", showOnEdit: true },
+        { name: "reset", label: "重置", type: "warning", showAlways: true },
+        // { name: 'cancel', label: '取消', showAlways: true },
+      ],
+    },
+  };
+
+  const carPayloadDialogConfigs = {
     carPayloadDialog: true,
     clickModalToClose: true,
     tableConfig: {
@@ -88,6 +124,7 @@ export default function () {
 
 
   return {
+    carPayloadDialogConfigs,
     dialogConfigs: dialogJustFormConfigs,
     tableConfig: {
       table: null, // 此处可省略，el-table 上的配置项

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

@@ -3,6 +3,7 @@
     :table-config="tableConfig"
     :head-config="headFormConfigs"
     :dialog-configs="dialogConfigs"
+    :car-payload-dialog-configs="carPayloadDialogConfigs"
     :listQueryExtra="[{ pos: [1, 7] }]"
     :trigger-update="triggerUpdateKey"
     key="pallet"
@@ -22,14 +23,10 @@ export default {
       urls: this.allUrls,
     };
   },
-  computed: {
-    code() {
-      return this.$route.query.code || "";
-    },
-  },
   data() {
-    const { tableConfig, headFormConfigs, urls, dialogConfigs } = initConfig.call(this);
+    const { tableConfig, headFormConfigs, carPayloadDialogConfigs, urls, dialogConfigs } = initConfig.call(this);
     return {
+      carPayloadDialogConfigs,
       tableConfig,
       headFormConfigs,
       allUrls: urls,