问题修改

src/router/views/index.js

@@ -166,6 +166,36 @@ export default [
       },
     ],
   },
+  {
+    path: '/retrospectDefend',
+    component: Layout,
+    redirect: '/retrospectDefend/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/retrospectDefend/index.vue'),
+        name: '生产追溯维护',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
+   {
+    path: '/eleFilesEdit',
+    component: Layout,
+    redirect: '/eleFilesEdit/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/eleFilesEdit/index.vue'),
+        name: '电子档案维护',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
 
   {
     path: '/work/process/leave',

src/views/logisticsManagement/components/addPackingDialog.vue

@@ -94,7 +94,12 @@ export default {
       getQuantityLocation({ boxBarcode: this.form.boxBarcode }).then(res => {
         this.formLoading = true;
         this.boxBarInfo = res.data.data;
-        this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo);
+        if(res.data.data.yieldOrderList!= null ){
+           this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo);
+        }else{
+          this.orderIdList = []
+        }
+       
         setTimeout(() => {
           this.$message.success('箱条码获取数据成功！');
           this.formLoading = false;

src/views/logisticsManagement/components/returnDialog.vue

@@ -22,7 +22,8 @@
         />
       </el-form-item>
       <el-form-item label="起点站点" v-if="form.bindType == 'unbind'" required>
-        <el-select
+        <el-input v-model="form.regionIndex" disabled placeholder="蓝色周转盒放置区" />
+        <!-- <el-select
           v-model="form.regionIndex"
           placeholder="请选择站点区域"
           @change="val => regionDataStartChange(val)"
@@ -33,7 +34,7 @@
             :label="item.stationRegion"
             :value="item.stationRegion"
           ></el-option>
-        </el-select>
+        </el-select> -->
         <el-select
           v-model="form.regionCode"
           placeholder="请选择站点码"
@@ -47,8 +48,9 @@
             :value="item"
           ></el-option>
         </el-select>
+        <el-tag type="danger" v-if="regionStartCode.length<=0">暂无可配送物料</el-tag>
       </el-form-item>
-      <el-form-item label="终点站点" prop="endLocationId" v-if="form.bindType == 'bind'">
+      <el-form-item label="终点站点" prop="endLocationId" v-if="form.bindType == 'bind'" required>
         <el-select
           v-model="form.endLocationId"
           placeholder="请选择作业中心"
@@ -71,7 +73,7 @@
           <el-option v-for="item in regionData" :key="item" :label="item" :value="item" />
         </el-select>
       </el-form-item>
-      <el-form-item label="终点站点" prop="endLocationId" v-if="form.bindType == 'unbind'">
+      <el-form-item label="终点站点" prop="endLocationId" v-if="form.bindType == 'unbind'" required>
         <el-input v-model="form.endStationCode" placeholder="请扫描箱条码" />
       </el-form-item>
     </el-form>
@@ -112,7 +114,8 @@ export default {
         endLocationRange: '', //终点区域
         regionIndex: '', //起点区域
         regionCode: '', //起点区域码
-        endStationCode:'',//终点区域码
+        endStationCode: '', //终点区域码
+        stationCode: '', //起点站点码
       },
       rules: {
         boxBarcode: [{ required: true, message: '请扫描箱条码', trigger: 'blur' }],
@@ -140,7 +143,7 @@ export default {
     },
     regionDataStartChange(val) {
       const selected = this.regionDataStart.find(
-        item => item.stationRegion === this.form.regionIndex
+        item => item.stationRegion == this.form.regionIndex
       );
       this.regionStartCode = selected.stationCodeList;
       // 默认选择第一个站点码
@@ -153,12 +156,25 @@ export default {
     getStationRegionList() {
       getStationRegionList().then(res => {
         this.regionDataStart = res.data.data;
+        // 查找“蓝色周转盒放置区”
+        const targetRegion = this.regionDataStart.find(item => item.stationRegion == '蓝色周转盒放置区');
+
+        if (targetRegion) {
+          // 默认选中该区域
+          this.form.regionIndex = targetRegion.stationRegion;
+          // 给区域下拉框数据赋值
+          this.regionStartCode = targetRegion.stationCodeList || [];
+
+          // 可选：默认选中第一个站点码
+          if (this.regionStartCode.length > 0) {
+            this.form.regionCode = this.regionStartCode[0];
+          }
+        }
       });
     },
     // 获取终点站名字
     endLocationChange() {
       const selected = this.workCenterOptions.find(item => item.id === this.form.endLocationId);
-      console.log(989898989898, selected);
       this.regionData = selected ? selected.stationRegionList : [];
       this.form.endName = selected ? selected.wcName : '';
     },
@@ -184,12 +200,12 @@ export default {
             boxBarcode: this.form.boxBarcode, //箱条码
             // endWcId: this.form.endLocationId,
             endWcId: this.form.endLocationId, // 配送模式
-            
           };
 
           // 送料模式：使用 stationCode
           if (this.form.bindType === 'bind') {
             params.startStationCode = this.form.stationCode;
+            params.stationRegion = this.form.regionName;
           }
           // 叫料模式：使用 regionCode 和 regionIndex
           else if (this.form.bindType === 'unbind') {

src/views/logisticsManagement/components/unbindDialog.vue

@@ -83,7 +83,12 @@ export default {
       getQuantityLocation({ boxBarcode: this.form.boxBarcode }).then(res => {
         this.formLoading = true;
         this.boxBarInfo = res.data.data;
-        this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo);
+        if (this.boxBarInfo.yieldOrderList !== null) {
+          this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo);
+        } else {
+          this.orderIdList = [];
+        }
+
         setTimeout(() => {
           this.$message.success('箱条码获取数据成功！');
           this.formLoading = false;
@@ -112,7 +117,7 @@ export default {
         .then(res => {
           this.form.orderNo = '';
           this.$message.success('解绑成功');
-          this.changeCode()
+          this.changeCode();
         })
         .catach(err => {
           this.orderIdList.pop(orderNo);

src/views/wel/components/quickAccess.vue

@@ -5,38 +5,86 @@
       <span style="color: #409eff; font-size: 14px">管理</span>
     </div>
     <div class="access_box">
-      <div
+        <!-- { name: '工序接收', url: 'plan', page: '/zhgd-work/taskCope' },
+        { name: '工序报工', url: 'rule', page: '/workReport/index' },
+        { name: '工序检验', url: 'product', page: '/workCheck/index' },
+        { name: '生产追溯维护', url: 'craft', page: '/retrospectDefend/index' },
+        { name: '电子档案维护', url: 'quality', page: '/eleFilesEdit/index' }, -->
+      <div class="access_box_item" @click="turnPage('/zhgd-work/taskCope')" v-if="permission.wel_taskCope">
+        <img src="@/assets/product.png" alt="" />
+        <span>工序接收</span>
+      </div>
+      <div class="access_box_item" @click="turnPage('/workReport/index')" v-if="permission.wel_workReport">
+        <img src="@/assets/plan.png" alt="" />
+        <span>工序报工</span>
+      </div>
+       <div class="access_box_item" @click="turnPage('/workCheck/index')" v-if="permission.wel_workCheck">
+        <img src="@/assets/rule.png" alt="" />
+        <span>工序检验</span>
+      </div>
+       <div class="access_box_item" @click="turnPage('/retrospectDefend/index')" v-if="permission.wel_retrospectDefend">
+        <img src="@/assets/output.png" alt="" />
+        <span>生产追溯维护</span>
+      </div>
+      <div class="access_box_item" @click="turnPage('/eleFilesEdit/index')" v-if="permission.wel_eleFilesEdit">
+        <img src="@/assets/craft.png" alt="" />
+        <span>电子档案维护</span>
+      </div>
+      <!-- <div
         class="access_box_item"
         v-for="item in accessData"
         :key="item.name"
         @click="turnPage(item.page)"
       >
-        <img v-show="item.url == 'product'" src="@/assets/product.png" alt="" />
+        <img
-        <img v-show="item.url == 'plan'" src="@/assets/plan.png" alt="" />
+          v-show="item.url == 'product' && permission.wel_taskCope"
-        <img v-show="item.url == 'rule'" src="@/assets/rule.png" alt="" />
+          src="@/assets/product.png"
-        <img v-show="item.url == 'output'" src="@/assets/output.png" alt="" />
+          alt=""
-        <img v-show="item.url == 'craft'" src="@/assets/craft.png" alt="" />
+        />
-        <img v-show="item.url == 'quality'" src="@/assets/quality.png" alt="" />
+        <img
+          v-show="item.url == 'plan' && permission.wel_workReport"
+          src="@/assets/plan.png"
+          alt=""
+        />
+        <img
+          v-show="item.url == 'rule' && permission.wel_workCheck"
+          src="@/assets/rule.png"
+          alt=""
+        />
+        <img
+          v-show="item.url == 'output' && permission.wel_retrospectDefend"
+          src="@/assets/output.png"
+          alt=""
+        />
+        <img
+          v-show="item.url == 'craft' && permission.wel_eleFilesEdit"
+          src="@/assets/craft.png"
+          alt=""
+        />
         <span>{{ item.name }}</span>
-      </div>
+      </div> -->
     </div>
     <!-- 工序报工 -->
-     <!-- <taskCope></taskCope> -->
+    <!-- <taskCope></taskCope> -->
   </div>
 </template>
 
 <script>
 import taskCope from '@/views/zhgd-work/taskCope/index.vue';
+import { mapGetters } from 'vuex';
 export default {
   components: { taskCope },
+  computed: {
+    ...mapGetters(['userInfo', 'permission']),
+  },
   data() {
     return {
       accessData: [
         { name: '工序接收', url: 'plan', page: '/zhgd-work/taskCope' },
         { name: '工序报工', url: 'rule', page: '/workReport/index' },
-        { name: '工序检验', url: 'product',page:'/workCheck/index' },
+        { name: '工序检验', url: 'product', page: '/workCheck/index' },
-        // { name: '工艺模板', url: 'craft' },
+        { name: '生产追溯维护', url: 'craft', page: '/retrospectDefend/index' },
-        // { name: '质量检验', url: 'quality' },
+        { name: '电子档案维护', url: 'quality', page: '/eleFilesEdit/index' },
       ],
     };
   },

src/views/zhgd-work/eleFilesEdit/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>电子档案维护</div>
+</template>

src/views/zhgd-work/index.js

@@ -0,0 +1,271 @@
+import Layout from '@/page/index/index.vue';
+import Store from '@/store/';
+
+export default [
+  {
+    path: '/wel',
+    component: () =>
+      Store.getters.isMacOs ? import('@/mac/index.vue') : import('@/page/index/index.vue'),
+    redirect: '/wel/index',
+    children: [
+      {
+        path: 'index',
+        // name: '首页',
+        name: '工作台',
+        meta: {
+          i18n: 'dashboard',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/index.vue'),
+      },
+      {
+        path: 'search',
+        // name: '首页',
+        name: '搜索',
+        meta: {
+          i18n: 'dashboard',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/search.vue'),
+      },
+      {
+        path: 'dashboard',
+        name: '控制台',
+        meta: {
+          i18n: 'dashboard',
+          menu: false,
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/dashboard.vue'),
+      },
+      {
+        path: '/wel/taskCope',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/taskCope/index.vue'),
+        name: '工序接收',
+        meta: {
+          keepAlive: true,
+          isTab: false,
+          isAuth: false,
+        },
+      },
+      // workReport
+
+      // {
+      //   path: 'search',
+      //   name: '菜单搜索',
+      //   meta: {
+      //     i18n: 'search',
+      //     menu: false,
+      //   },
+      //   component: () => import(/* webpackChunkName: "views" */ '@/views/wel/search.vue'),
+      // }
+    ],
+  },
+  {
+    path: '/test',
+    component: Layout,
+    redirect: '/test/index',
+    children: [
+      {
+        path: 'index',
+        name: '测试页',
+        meta: {
+          i18n: 'test',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/util/test.vue'),
+      },
+    ],
+  },
+  {
+    path: '/dict-horizontal',
+    component: Layout,
+    redirect: '/dict-horizontal/index',
+    children: [
+      {
+        path: 'index',
+        name: '字典管理',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal.vue'),
+      },
+    ],
+  },
+  {
+    path: '/dict-vertical',
+    component: Layout,
+    redirect: '/dict-vertical/index',
+    children: [
+      {
+        path: 'index',
+        name: '字典管理',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical.vue'),
+      },
+    ],
+  },
+  {
+    path: '/info',
+    component: Layout,
+    redirect: '/info/index',
+    children: [
+      {
+        path: 'index',
+        name: '个人信息',
+        meta: {
+          i18n: 'info',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/system/userinfo.vue'),
+      },
+    ],
+  },
+  {
+    path: '/zhgd-work',
+    component: Layout,
+    redirect: '/zhgd-work/taskCope',
+    children: [
+      {
+        path: 'taskCope',
+        name: '工序接收',
+        meta: {
+          i18n: 'info',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/zhgd-work/taskCope/index.vue'),
+      },
+
+    ],
+  },
+  {
+    path: '/workReport',
+    component: Layout,
+    redirect: '/workReport/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workReport/index.vue'),
+        name: '工序报工',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
+  {
+    path: '/workCheck',
+    component: Layout,
+    redirect: '/workCheck/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workCheck/index.vue'),
+        name: '工序检验',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
+  {
+    path: '/retrospectDefend',
+    component: Layout,
+    redirect: '/retrospectDefend/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/retrospectDefend/index.vue'),
+        name: '生产追溯维护',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
+   {
+    path: '/eleFilesEdit',
+    component: Layout,
+    redirect: '/eleFilesEdit/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/eleFilesEdit/index.vue'),
+        name: '电子档案维护',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
+
+  {
+    path: '/work/process/leave',
+    component: Layout,
+    redirect: '/work/process/leave/form',
+    children: [
+      {
+        path: 'form/:processDefinitionId',
+        name: '请假流程',
+        meta: {
+          i18n: 'work',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/form.vue'),
+      },
+      {
+        path: 'handle/:taskId/:processInstanceId/:businessId',
+        name: '处理请假流程',
+        meta: {
+          i18n: 'work',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/handle.vue'),
+      },
+      {
+        path: 'detail/:processInstanceId/:businessId',
+        name: '请假流程详情',
+        meta: {
+          i18n: 'work',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/detail.vue'),
+      },
+    ],
+  },
+  {
+    path: '/workflow',
+    component: Layout,
+    children: [
+      {
+        path: 'design/process/:id',
+        name: '模型设计2',
+        component: () =>
+          import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/pages/design/index.vue'),
+      },
+      {
+        path: 'design/model/history/:id',
+        name: '模型历史',
+        component: () =>
+          import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/pages/design/model-history.vue'),
+      },
+      {
+        path: 'design/form/history/:id',
+        name: '表单历史',
+        component: () =>
+          import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/pages/design/form-history.vue'),
+      },
+      {
+        path: 'process/start/:params',
+        name: '新建流程2',
+        component: () =>
+          import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/pages/process/form/start.vue'),
+      },
+      {
+        path: 'process/detail/:params',
+        name: '流程详情',
+        component: () =>
+          import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/pages/process/form/detail.vue'),
+      }
+    ]
+  },
+
+];

src/views/zhgd-work/retrospectDefend/index.vue

@@ -0,0 +1,8 @@
+<template>
+ <basic-container>生产追溯维护</basic-container>
+</template>
+<script>
+</script>
+<style lang="scss" scoped>
+
+</style>