更新

src/application/mk/basic-pages/list.vue

@@ -15,7 +15,7 @@
       </a-col>
       <a-col :flex="$mk.config.ui.toolbarFlex">
         <!-- 工具条 -->
-        <mk-toolbar @toolbarClick="toolbarClick"></mk-toolbar>
+        <mk-toolbar :isShowAdd="options.disabledAdd !== true" @toolbarClick="toolbarClick"></mk-toolbar>
       </a-col>
     </a-row>
 
@@ -64,6 +64,9 @@
         <template #column5="{ row }">
           <slot name="column5" :row="row"></slot>
         </template>
+        <template #column6="{ row }">
+          <slot name="column6" :row="row"></slot>
+        </template>
       </vxe-grid>
     </div>
 
@@ -401,6 +404,9 @@ export default {
         url: this.options.actions.getList,
         data: params,
         listFieldName: this.options.listFieldName,
+        callback: (e) => {
+          this.$emit("loadData", e)
+        },
         rowFilters: this.rowFilters
       });
     },
@@ -654,6 +660,7 @@ export default {
 .mytable-style .row-lightred td {
   background-color: #ff9b9b9e;
 }
+
 .mytable-style .row-lightyellow td {
   background-color: #ffe09b9e;
 }

src/application/mk/components/toolbar/toolbar.vue

@@ -9,7 +9,7 @@
       <a class="iconlink" title="设置" @click="toolbarClick({ name: 'setting' })"> <a-icon type="setting"></a-icon></a>
     </a-tooltip>
 
-    <a-button type="primary" @click="toolbarClick({name:'add'})">
+    <a-button v-if="isShowAdd" type="primary" @click="toolbarClick({ name: 'add' })">
       新增
     </a-button>
     <a-button v-if="isShowDelete" type="primary" @click="toolbarClick({ name: 'delete' })">
@@ -20,7 +20,6 @@
       {{ btn.label }}
     </a-button>
   </div>
-
 </template>
 <script>
 
@@ -37,6 +36,10 @@ export default {
       default: true
     },
 
+    isShowAdd: {
+      type: Boolean,
+      default: false
+    },
     isShowDelete: {
       type: Boolean,
       default: false
@@ -86,9 +89,9 @@ export default {
   position: relative;
   top: 6px;
 }
+
 .iconlink svg {
   width: 25px;
   height: 25px;
 }
-
 </style>

src/pages/Middle/Mold/MoldProductionOrder/List.vue

@@ -14,11 +14,14 @@
 
 
     <template v-slot:column4="{ row }">
-      <img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image" @click.stop="$hevueImgPreview(row.mold_detail.image)" />
+      <img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image"
+        @click.stop="$hevueImgPreview(row.mold_detail.image)" />
       <span v-else></span>
     </template>
     <template v-slot:column5="{ row }">
-      <a-button type="link" @click="pageEdit(row.change_production_detail)" v-if="row.change_production_detail && row.change_production_detail.id">{{ row.change_production_detail.code }}</a-button>
+      <a-button type="link" @click="pageEdit(row.change_production_detail)"
+        v-if="row.change_production_detail && row.change_production_detail.id">{{ row.change_production_detail.code
+        }}</a-button>
     </template>
 
 
@@ -213,10 +216,10 @@ export default {
           },
           // 表格列配置
           columns: [
-            { type: 'checkbox', width: 80 }, // 多选框
+            { type: 'checkbox', width: 50 }, // 多选框
-            { type: 'seq', width: 60 }, // 序号 
+            { type: 'seq', width: 40 }, // 序号 
 
-            { title: '操作', slots: { default: 'op' }, width: 90 },
+            { title: '操作', slots: { default: 'op' }, width: 110 },
 
 
 

src/pages/Middle/Mold/MoldProductionOrder/ProcessesList.vue

@@ -0,0 +1,288 @@
+<template>
+  <basic-page-list ref="listPage" :desc="desc" :options="pageOptions" @loadData="loadData">
+    <template v-slot:column1="{ row }">
+      <a-button @click.stop="pageDetail(row)">查看详情</a-button>
+    </template>
+
+    <template v-slot:column2="{ row }">
+      <a-table :columns="columns" :data-source="row.department_progress" style="border:1px solid #afafaf">
+        <span slot="progress" slot-scope="progress">
+          <a-progress type="line" :percent="progress" />
+        </span>
+      </a-table>
+    </template>
+
+
+    <template v-slot:column4="{ row }">
+      <img v-if="row.image" style="width:50px;height:50px;" :src="row.image" @click.stop="$hevueImgPreview(row.image)" />
+      <span v-else></span>
+    </template>
+    <template v-slot:column5="{ row }">
+      <a-button type="link" @click="pageEdit(row.change_production_detail)"
+        v-if="row.change_production_detail && row.change_production_detail.id">{{ row.change_production_detail.code
+        }}</a-button>
+    </template>
+
+
+    <template v-slot:column3="{ row }">
+      <a-table :columns="columns" :data-source="row.department_progress" style="border:1px solid #afafaf;margin: 15px;">
+        <span slot="progress" slot-scope="progress">
+          <a-progress type="line" :percent="progress" />
+        </span>
+      </a-table>
+    </template>
+
+  </basic-page-list>
+</template>
+
+<script>
+import BASE_URL from '@/services/mes/api.js';
+
+const settings = require('../basic/settings.js');
+
+export default {
+  i18n: require("./i18n"),
+  props: {
+
+  },
+  data() {
+    return {
+      columns: [
+
+        {
+          title: '部门名',
+          dataIndex: 'name',
+          key: 'name',
+        },
+        {
+          title: '部门编码',
+          dataIndex: 'code',
+          key: 'code',
+        },
+        {
+          title: '工序数量',
+          dataIndex: 'process_num',
+          key: 'process_num',
+        },
+        {
+          title: '进度',
+          dataIndex: 'progress',
+          key: 'progress',
+          slots: { title: 'progress' },
+          scopedSlots: { customRender: 'progress' },
+        },
+      ],
+      pageOptions: {}
+    };
+  },
+  // 计算属性
+  computed: {
+    // 页面描述
+    desc() {
+      return this.$t("pageDesc");
+    }
+  },
+
+
+  // 创建完成
+  created() {
+    this.optionsInit();
+  },
+  // 动作
+  methods: {
+
+
+
+    optionsInit() {
+      // 页面数据
+      var pageData = { // 页面数据变量
+
+        keyName: 'id', // 主键字段名 
+        listFieldName: 'MoldProductionOrderComponentProcesses',
+        addPageUrl: "/Mold/MoldProductionOrderAdd",
+        editPageUrl: "/Mold/MoldProductionOrderUpdate/",
+        // 接口动作
+        actions: { // Api 接口地址 
+          getList: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/list`,
+          delete: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/batchDelete`
+        },
+
+        start_time: 0, // 开始时间
+        end_time: 0, // 结束时间
+
+        exportFileTitle: "模型",
+        enabledExport: false,
+        enabledImport: false,
+        enabledImportTemplate: false,
+        disabledAdd: true,
+
+        //搜索区
+        searchFormData: {
+          title: '',
+          desc: '',
+          is_complete: '0',
+        },
+        // 搜索区配置
+        searchRules: [
+          { key: "code", mode: "like" },
+          { key: "mold_master_uid", mode: "=" },
+          { key: "is_complete", mode: "=" },
+          { key: "engineer_uid", mode: "=" }
+        ],
+        //搜索区
+        searchFormItems: [ // 子项
+
+
+          { field: 'code', title: '编码', span: 3, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
+          { field: 'customer_name', title: '客户名称', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入客户名称' } } },
+
+          {
+            title: '模具师傅', span: 4,
+            field: 'mold_master_uid',
+            dataRule: {
+              fromField: "id"
+            },
+            itemRender: {
+              name: 'MkFormDataSelector', props: {
+                params: {
+                  dataType: "object",
+                  valueField: "id",
+                  textField: "name",
+                  listdataFieldName: 'MesStaff',
+                  dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
+                }
+              }
+            }
+          },
+          {
+            title: '工程师傅', span: 3,
+            field: 'engineer_uid',
+            dataRule: {
+              fromField: "id"
+            },
+            itemRender: {
+              name: 'MkFormDataSelector', props: {
+                params: {
+                  dataType: "object",
+                  valueField: "id",
+                  textField: "name",
+                  listdataFieldName: 'MesStaff',
+                  dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
+                }
+              }
+            }
+          },
+
+          { field: 'is_complete', title: '状态', span: 3, itemRender: { name: '$select', props: { options: settings.options_is_complete } } },
+
+          {
+            align: 'right', span: 4, itemRender: {  // 按钮列
+              name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },  // 搜索按钮
+              { props: { type: 'reset', content: '重置' } }]
+            }
+          }
+        ],
+
+
+        //数据区
+        gridOptions: { // 表格配置
+          height: '100%', // 表格高度  100% 会自动撑满父容器
+          stripe: true, // 启用斑马纹
+          id: 'datagrid_1', // 表格唯一标识
+          sortConfig: {
+            defaultSort: {
+              field: 'complete_time',
+              order: 'asc'
+            },
+            trigger: 'cell', // 触发排序的方式
+            remote: true // 是否远程排序
+          },
+          // 表格列配置
+          columns: [
+            { type: 'checkbox', width: 50 }, // 多选框
+            { type: 'seq', width: 50 }, // 序号 
+
+            // { title: '操作', slots: { default: 'op' }, width: 110 },
+
+
+
+            { slots: { default: 'column1' }, title: '查看详情', width: 120 },
+            { field: 'department_name', title: '部门', sortable: true, width: 100 },
+            { field: 'process_name', title: '工序名称', sortable: true, width: 100 },
+            { title: '模具图片', slots: { default: 'column4' }, width: 90 },
+            { field: 'production_code', title: '布产单号', sortable: true, width: 100 },
+            { field: 'mold_master_name', sortable: true, title: '模具师傅', width: 120 },
+            { field: 'engineer_name', sortable: true, title: '工程师傅', width: 120 },
+            { field: 'ask_complete_time', formatter: 'formatDate', width: 130, sortable: true, title: '预计完成时间', showHeaderOverflow: true },
+
+            { field: 'status', title: '状态', sortable: true, width: 100 },
+            { field: 'send_time', formatter: 'formatDate', width: 130, sortable: true, title: '发料日期', showHeaderOverflow: true }, // 创建时间 
+            { field: 'complete_time', formatter: 'formatDate', width: 130, sortable: true, title: '完工日期', showHeaderOverflow: true }, // 创建时间 
+            { field: 'remark', width: 130, sortable: true, title: '备注', showHeaderOverflow: true }, // 创建时间 
+
+            // =============================== 表格列 自动生成 Start ===============================
+
+
+          ]
+        }
+
+      };
+
+      pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
+
+      pageData.gridOptions.sortInit = ({ sort, params }) => {
+        if (sort.property == "progress") {
+          params.progress_order = sort.order;
+        } else {
+          params.order_bys = params.order_bys || [];
+          params.order_bys.push({ // 添加排序信息
+            column: sort.property, // 字段名
+            order: sort.order // 排序方式
+          })
+        }
+      }
+
+      this.pageOptions = pageData;
+
+    },
+    loadData(e) {
+
+      e.MoldProductionOrderComponentProcesses.forEach(item => {
+        if (item.production_detail.code == "") {
+          // 删除该item 并继续循环
+          e.MoldProductionOrderComponentProcesses.splice(e.MoldProductionOrderComponentProcesses.indexOf(item), 1);
+          return;
+        }
+        item.image = item.component_detail.image;
+        item.department_name = item.department_detail.name;
+        item.process_name = item.process_detail.name;
+        item.production_code = item.production_detail.code;
+      });
+
+    },
+
+    pageDetail(row) {
+
+      if (!row) {
+        this.$mk.msg("请选择行");
+        return;
+      }
+      this.$openPage('/Mold/MoldProductionOrderDetail/' + row.id)
+    },
+
+    pageEdit(row) {
+
+      if (!row) {
+        this.$mk.msg("请选择行");
+        return;
+      }
+      this.$openPage('/Mold/MoldProductionOrderUpdate/' + row.id)
+    },
+
+  },
+  watch: {
+
+  }
+};
+
+</script> 

src/pages/Middle/Mold/Touch/Reporting.vue

@@ -291,7 +291,7 @@ import BASE_URL from '@/services/mes/api.js';
 
 import XEUtils from 'xe-utils'  // 加载xe-utils 
 import JSONbig from 'json-bigint'
-import { ref } from 'vue';
+
 export default {
 
   name: '',
@@ -359,7 +359,7 @@ export default {
       processesDepartmentId: 0, // 按部门id筛选
       department_list: [], // 部门列表
       // department_list_options 默认值为全部
-      department_list_options_default: ref("0"),
+      department_list_options_default: "0",
       department_list_options: [
         {
           label: "全部部门",
@@ -367,8 +367,8 @@ export default {
         }
       ],  // 部门列表下拉框
 
-      processesIsComplete: 0, // 按是否完成筛选
+      processesIsComplete: "0", // 按是否完成筛选
-      IsCompleteDefault: ref("0"),
+      IsCompleteDefault: "0",
       IsCompleteOptions: [
         {
           label: "未完成",
@@ -381,8 +381,8 @@ export default {
       ],  // 是否完成下拉框
 
 
-      processesIsSend: 0, // 按是否已发料筛选
+      processesIsSend: "1", // 按是否已发料筛选
-      IsSendDefault: ref("0"),
+      IsSendDefault: "1",
       IsSendOptions: [
         {
           label: "未发料",
@@ -569,7 +569,7 @@ export default {
   created() {
 
     setTimeout(() => {
-      this.$refs.inputx.focus();
+      this.$refs.inputx.focus(); // 获取焦点
 
       this.loadPoData();
       this.loadDataProgress(185208273404694528, 0);
@@ -601,17 +601,17 @@ export default {
         url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/order/list`,
         loading: "搜索中...",
         data: {
+          "beid": parseInt(process.env.VUE_APP_BEID),
           "ptyid": 0,
           "company_id": parseInt(process.env.VUE_APP_COMPANY_ID),
+          "store_id": 0,
+          "project_token": process.env.VUE_APP_APPTOKEN,
+          "company_token": process.env.VUE_APP_COMPANYTOKEN,
           "search_rules": [
           ],
           "end_time": 0,
-          "company_token": process.env.VUE_APP_COMPANYTOKEN,
-          "store_id": 0,
           "order_bys": [{ "column": "complete_time", "order": "asc" }],
           "limit": 0,
-          "project_token": process.env.VUE_APP_APPTOKEN,
-          "beid": parseInt(process.env.VUE_APP_BEID),
           "page": 1,
           "start_time": 0
         },
@@ -624,20 +624,20 @@ export default {
 
     loadDeaprtmentData() {
       this.$mk.post({
-        url: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`,
+        url: `${BASE_URL.BASE_URL}/BaseDepartment/Get/v1/base/department/anonymous/list`,
         loading: "加载中...",
         data: {
+          "beid": parseInt(process.env.VUE_APP_BEID),
           "ptyid": 0,
           "company_id": parseInt(process.env.VUE_APP_COMPANY_ID),
+          "store_id": 0,
+          "project_token": process.env.VUE_APP_APPTOKEN,
+          "company_token": process.env.VUE_APP_COMPANYTOKEN,
           "search_rules": [
           ],
           "end_time": 0,
-          "company_token": process.env.VUE_APP_COMPANYTOKEN,
-          "store_id": 0,
           "order_bys": [],
-          "limit": 0,
+          "limit": 100,
-          "project_token": process.env.VUE_APP_APPTOKEN,
-          "beid": parseInt(process.env.VUE_APP_BEID),
           "page": 1,
           "start_time": 0
         },
@@ -1181,17 +1181,17 @@ export default {
     },
     DepartmentChange(e) {
       this.processesDepartmentId = e
-      this.department_list_options_default = ref(e)
+      this.department_list_options_default = e
       this.loadDataProgress()
     },
     IsCompleteChange(e) {
       this.processesIsComplete = e
-      this.IsCompleteDefault = ref(e)
+      this.IsCompleteDefault = e
       this.loadDataProgress()
     },
     IsSendChange(e) {
       this.processesIsSend = e
-      this.IsSendDefault = ref(e)
+      this.IsSendDefault = e
       this.loadDataProgress()
     }
 

src/router/Middle/Mold/router.map.js

@@ -214,7 +214,7 @@ routerMap['MoldProductionOrderDetail']= {
   icon: 'idcard',
   path: `/Mold/MoldProductionOrderDetail/:id`,
   meta: {
-    invisible: true,
+    invisible: true, // 不在菜单显示
     page: { cacheAble: false }
   },
   component: () => import(`@/pages/Middle/Mold/MoldProductionOrder/Detail`),
@@ -223,6 +223,19 @@ routerMap['MoldProductionOrderDetail']= {
   }
 };
 
+routerMap['MoldProductionOrderProcessesList'] = {
+  name: '布产部门工序列表',
+  icon: 'idcard',
+  path: `/MoldProductionOrder/MoldProductionOrderProcessesList`,
+  meta: {
+    page: { cacheAble: false }
+  },
+  component: () => import(`@/pages/Middle/Mold/MoldProductionOrder/ProcessesList`),
+  authority: {
+    permission: [],
+  }
+};
+
 routerMap['MoldScheme'] = {
   name: '模具设计',
   icon: 'idcard',