From 40609a1bd11ce79445562ac23f16af23a48c3933 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

---
 web_standard/src/views/ext/plansExt.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web_standard/src/views/ext/plansExt.vue b/web_standard/src/views/ext/plansExt.vue
index 6fdcdb1..dddd349 100644
--- a/web_standard/src/views/ext/plansExt.vue
+++ b/web_standard/src/views/ext/plansExt.vue
@@ -3,8 +3,8 @@
   <keep-alive><TableLayout v-permissions="['ext:plansext:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form slot="search-form" ref="searchForm" :model="searchForm" label-suffix="锛�" label-width="110px" inline>
-      <el-form-item label="鎼滅储淇℃伅" prop="mixParam">
-        <el-input v-model="searchForm.mixParam" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜/宸ュ簭鍚嶇О" @keypress.enter.native="search"></el-input>
+      <el-form-item label="鐗╂枡淇℃伅" prop="mixParam">
+        <el-input v-model="searchForm.mixParam" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="鎴愬搧璁″垝" prop="workPlanCode">
         <el-input v-model="searchForm.workPlanCode" placeholder="璇疯緭鍏ユ垚鍝佽鍒掔紪鐮�" @keypress.enter.native="search"></el-input>
@@ -71,19 +71,19 @@
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
       <ul class="toolbar">
-        <!-- <li v-permissions="['ext:plansext:importExcel']">
+        <li v-permissions="['ext:plansext:distribute']"><el-button type="primary" @click="plansDistribute">鎵归噺鍒嗛厤</el-button></li>
+        <li v-permissions="['ext:plansext:importExcel']">
           <ImportButton
             text="瀵煎叆"
             template-name="plans_import_template.xlsx"
-            template-path="template/plans_import_template.xlsx"
+            template-path="/template/plans_import_template.xlsx"
             action="/ext/plansExt/importBatch"
             @success="search"
           />
-        </li> -->
+        </li>
         <!-- <li v-permissions="['ext:plansext:create']"><el-button type="primary" @click="$refs.operaPlansExtWindow.open('鏂板缓鐢熶骇璁″垝')" >鏂板缓</el-button></li> -->
         <!-- <li v-permissions="['ext:plansext:publish']"><el-button type="primary" @click="planRelease" >鍙戝竷</el-button></li> -->
-        <li v-permissions="['ext:plansext:distribute']"><el-button type="primary" @click="plansDistribute">鎵归噺鍒嗛厤</el-button></li>
-        <li v-permissions="['ext:plansext:exportExcel']"><el-button type="primary" :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button></li>
+        <!-- <li v-permissions="['ext:plansext:exportExcel']"><el-button type="primary" :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button></li> -->
         <!-- <li v-permissions="['ext:plansext:planpink']"><el-button type="primary" @click="$refs.operaWTransferExtWindow.open('璁″垝棰嗘枡')">璁″垝棰嗘枡</el-button></li> -->
         <!-- <li v-permissions="['ext:plansext:stockpink']"><el-button type="primary" @click="$refs.operaPlanStaock.open('搴撳瓨棰嗘枡')">搴撳瓨棰嗘枡</el-button></li> -->
         <!-- <li v-permissions="['ext:plansext:delete']"><el-button type="danger" plain @click="deleteByIdInBatch">鎵归噺鍒犻櫎</el-button></li> -->

--
Gitblit v1.9.3