zhuangyunsheng 1 anno fa
parent
commit
573b3054a8

+ 1 - 36
src/components/scChengTou/purchase/apply.vue

@@ -128,32 +128,6 @@
 					</sc-upload-file>
 				</el-form-item>
 			</el-col>
-		</el-row>
-	</el-form>
-
-    <el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" :model="form" :rules="rules" label-width="120px">
-		<el-row>
-			<el-col :xs="24">
-                <el-form-item label="初稿:">
-                    <sc-upload-file v-model="form.folders['purchase/first'].entities" :limit="10" :disabled="!updateFolder">
-                        <el-button type="primary" icon="el-icon-upload" size="small"></el-button>
-                    </sc-upload-file>
-                </el-form-item>
-			</el-col>
-            <el-col :xs="24">
-                <el-form-item label="终稿:">
-                    <sc-upload-file v-model="form.folders['purchase/final'].entities" :limit="10" :disabled="!updateFolder">
-                        <el-button type="primary" icon="el-icon-upload" size="small"></el-button>
-                    </sc-upload-file>
-                </el-form-item>
-			</el-col>
-            <el-col :xs="24">
-                <el-form-item label="扫描件:">
-                    <sc-upload-file v-model="form.folders['purchase/print'].entities" :limit="10" :disabled="!updateFolder">
-                        <el-button type="primary" icon="el-icon-upload" size="small"></el-button>
-                    </sc-upload-file>
-                </el-form-item>
-			</el-col>
             <el-col :xs="24" v-if="isIframe && form.status == 'approve'">
                 <el-form-item class="iframe-item__btn" label-width="0">
                     <template v-if="updateFolder">
@@ -220,16 +194,7 @@
 					folders: {
 						"purchase/apply": {
 							entities: []
-						},
-                        "purchase/first": {
-                            entities: []
-                        },
-                        "purchase/final": {
-                            entities: []
-                        },
-                        "purchase/print": {
-                            entities: []
-                        }
+						}
 					},
                     purchaseLaw: null
 				},

+ 5 - 2
src/components/scChengTou/purchase/handler.vue

@@ -166,7 +166,7 @@
                         </sc-upload-file>
                     </el-form-item>
                 </el-col>
-                <el-col :xs="24">
+                <el-col v-if="mode == 'purchase_bid_sign'" :xs="24">
                     <el-form-item :class="!updateFolder && 'no-upload-btn'" label="扫描件:">
                         <sc-upload-file v-model="form.folders[`${handlerKey('lowercase')}/print`].entities" :limit="10" :disabled="!updateFolder">
                             <el-button type="primary" icon="el-icon-upload" size="small"></el-button>
@@ -199,7 +199,7 @@
 			mode: { type: String, default: "purchase_matter" },
 			lg: { type: Number, default: 8 },
 			disabled: { type: Boolean, default: false },
-			isIframe: { type: Boolean, default: true }
+			isIframe: { type: Boolean, default: false }
 		},
 
 		data() {
@@ -280,6 +280,9 @@
                 this.form.folders[`${this.handlerKey("lowercase")}/final`] = {
 					entities: []
 				}
+            }
+
+            if (this.mode == "purchase_bid_sign") {
                 this.form.folders[`${this.handlerKey("lowercase")}/print`] = {
 					entities: []
 				}

+ 4 - 64
src/components/scChengTou/purchase/plan.vue

@@ -111,32 +111,6 @@
 					<el-date-picker v-model="form.endDate" value-format="YYYY-MM-DD" placeholder="请选择计划完成日期"></el-date-picker>
 				</el-form-item>
 			</el-col>
-		</el-row>
-	</el-form>
-
-	<el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" :model="form" :rules="rules" label-width="120px">
-		<el-row>
-			<el-col :xs="24">
-                <el-form-item label="初稿:">
-                    <sc-upload-file v-model="form.folders['plan/first'].entities" :limit="10" :disabled="!updateFolder">
-                        <el-button type="primary" icon="el-icon-upload" size="small"></el-button>
-                    </sc-upload-file>
-                </el-form-item>
-			</el-col>
-            <el-col :xs="24">
-                <el-form-item label="终稿:">
-                    <sc-upload-file v-model="form.folders['plan/final'].entities" :limit="10" :disabled="!updateFolder">
-                        <el-button type="primary" icon="el-icon-upload" size="small"></el-button>
-                    </sc-upload-file>
-                </el-form-item>
-			</el-col>
-            <el-col :xs="24">
-                <el-form-item label="扫描件:">
-                    <sc-upload-file v-model="form.folders['plan/print'].entities" :limit="10" :disabled="!updateFolder">
-                        <el-button type="primary" icon="el-icon-upload" size="small"></el-button>
-                    </sc-upload-file>
-                </el-form-item>
-			</el-col>
             <el-col :xs="24" v-if="isIframe && form.status == 'approve'">
                 <el-form-item class="iframe-item__btn" label-width="0">
                     <template v-if="updateFolder">
@@ -206,18 +180,7 @@
 					enterDate: null,
 					beginDate: null,
 					endDate: null,
-                    status: null,
-                    folders: {
-                        "plan/first": {
-                            entities: []
-                        },
-                        "plan/final": {
-                            entities: []
-                        },
-                        "plan/print": {
-                            entities: []
-                        }
-                    }
+                    status: null
 				},
 				rules: {
 					projectId: [{ required: true, message: "请选择采购所属项目" }],
@@ -266,16 +229,8 @@
 					const { plan } = await this.$API.procurement.plan.detail({ id: this.id });
 					this.loading = false;
 					for (const key in this.form) {
-                        if (key == "folders") {
-							if (plan[key]) {
-                                for (const folder_key in this.form[key]) {
-                                    this.form[key][folder_key]["entities"] = plan[key][folder_key].entities.map(({ id, mineType, name, path }) => ({ id, mineType, name, path })) || []
-                                }
-							}
-						} else {
-                            if (key == "contractPlanId" && plan[key]) this.hygh.modelValue = { contractPlanId: plan[key], name: plan["contractPlanName"], code: plan["contractPlanCode"] }
-                            this.form[key] = plan[key] || null;
-                        }
+                        if (key == "contractPlanId" && plan[key]) this.hygh.modelValue = { contractPlanId: plan[key], name: plan["contractPlanName"], code: plan["contractPlanCode"] }
+                        this.form[key] = plan[key] || null;
 					}
 				} catch (error) {
 					this.loading = false;
@@ -317,23 +272,8 @@
 			},
 
             submit() {
-                const data = {};
-				for (const key in this.form) {
-					if (key == "folders") {
-                        for (const folder_key in this.form[key]) {
-                            const planFiles = this.form[key][folder_key]["entities"].filter(item => !item.id).map(item => item.path);
-                            if (planFiles.length) {
-                                if (!data[key]) data[key] = {};
-                                data[key][folder_key] = {
-                                    entities: planFiles.map(ticket => ({ features: { ticket } }))
-                                }
-                            }
-                        }
-					} else data[key] = this.form[key];
-				}
-
                 this.isSaveing = true;
-				this.$API.procurement.plan.updateFile(data).then(() => {
+				this.$API.procurement.plan.updateFile(this.form).then(() => {
 					this.isSaveing = false;
 					this.$message.success("操作成功");
 					this.updateFolder = !this.updateFolder;