Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -143,20 +143,20 @@ const codemenu = [
       meta: { title: '上装配置管理', noCache: true }
     }]
   },
-  {
-    path: '/shangzhuang',
-    component: Layout,
-    redirect: '/shangzhuang',
-    meta: {
-      title: '上装台账管理'
-    },
-    children: [{
-      path: '/shangzhuang/shangzhuangtaizhangguanli',
-      component: () => import('@/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue'),
-      name: 'shangzhuangtaizhangguanli',
-      meta: { title: '上装台账管理', noCache: true }
-    }]
-  },
+  // {
+  //   path: '/shangzhuang',
+  //   component: Layout,
+  //   redirect: '/shangzhuang',
+  //   meta: {
+  //     title: '上装台账管理'
+  //   },
+  //   children: [{
+  //     path: '/shangzhuang/shangzhuangtaizhangguanli',
+  //     component: () => import('@/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue'),
+  //     name: 'shangzhuangtaizhangguanli',
+  //     meta: { title: '上装台账管理', noCache: true }
+  //   }]
+  // },
   // 合格证台账
   {
     path: '/hegezhengtaizhang',

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -18,7 +18,7 @@
                   <el-option v-for="item in paymentState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="入库时间">
+              <el-form-item label="认款时间">
                 <div class="block" style="float: left;">
                   <el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
@@ -98,7 +98,7 @@
     <!-- End 列表页面 -->
     <!-- 照片弹窗 -->
     <el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
-      <img :src="dialogImageUrl" alt="" />
+      <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
   </div>
 </template>