소스 검색

Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front

daiqisheng 3 년 전
부모
커밋
06c91aefdd
2개의 변경된 파일10개의 추가작업 그리고 8개의 파일을 삭제
  1. 9 7
      src/pages/main/performance/components/sheet.vue
  2. 1 1
      src/pages/main/performance/department.vue

+ 9 - 7
src/pages/main/performance/components/sheet.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors  : yuanrunwei
- * @LastEditTime : 2021-12-26 18:36:26
+ * @LastEditTime : 2021-12-26 19:33:50
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 
@@ -21,6 +21,7 @@
             >
             <template v-if="['edit'].includes(type)">
                 <el-upload
+                    v-if="!id"
                     class="margin-right-10 margin-left-10"
                     action
                     :on-change="handleChange"
@@ -32,8 +33,10 @@
                     type="primary"
                     @click="handleSave"
                     :disabled="handleForbid()"
-                    >{{ id ? "提交" : "新增"
-                    }}{{ handleForbid() ? `(请先设置权限)` : "" }}</el-button
+                    ><span>{{ id ? "提交" : "新增" }}</span
+                    ><span>{{
+                        handleForbid() ? `(请先设置权限)` : ""
+                    }}</span></el-button
                 >
             </template>
         </div>
@@ -163,7 +166,6 @@ export default {
             default: "template", // template 模板 order 工单 file 文件
         },
         id: {
-            type: Number,
             default: null,
         },
     },
@@ -364,13 +366,13 @@ export default {
             let edit_url = "";
             switch (this.attribute) {
                 case "template":
-                    edit_url = ""
+                    edit_url = "";
                     break;
                 case "order":
-                    edit_url = "/market/CMKIssued/CMKIssuedSubmit";
+                    edit_url = "";
                     break;
                 case "file":
-                    edit_url = "";
+                    edit_url = "/market/CMKIssued/CMKIssuedSubmit";
                     break;
             }
             const sheet_name = window.luckysheet.getSheet().name;

+ 1 - 1
src/pages/main/performance/department.vue

@@ -70,7 +70,7 @@
           </div> -->
         </div>
         <!-- 主体部分 -->
-        <simple-sheet :id="edit_form.id" />
+        <simple-sheet v-if="visible" :id="edit_form.id" :type="edit_visible?'edit':'view'" attribute="file" />
         <!-- <analysis
           :edit="edit_form.department_status === '待处理' && edit_visible"
         /> -->