Browse Source

八爪鱼调整

Lijy 2 năm trước cách đây
mục cha
commit
dccd0d13f5

+ 9 - 6
fhKeeper/formulahousekeeper/octopus/src/views/signing/list.vue

@@ -149,8 +149,8 @@
                 <el-form-item label="标准单价:" label-width="150px" prop="standardUnitPrice">
                     <el-input size="small" controls-position="right" v-model.number="formInline.standardUnitPrice" :disabled="finalize" style="width: 100px"></el-input> 元每人每年
                 </el-form-item>
-                <el-form-item label="首次开通人数:" :min="0" label-width="150px" prop="firstOpenNum" style="width: 100%">
-                    <el-input-number size="small" controls-position="right" v-model.number="formInline.firstOpenNum" :disabled="finalize" style="width: 100px"></el-input-number> 人
+                <el-form-item label="首次开通人数:" label-width="150px" prop="firstOpenNum" style="width: 100%">
+                    <el-input-number size="small" :min="0" controls-position="right" v-model.number="formInline.firstOpenNum" :disabled="finalize" style="width: 100px"></el-input-number> 人
                 </el-form-item>
                 <el-form-item label="甲方账号:" label-width="150px">
                     32050188143600000075
@@ -184,7 +184,10 @@
             <span slot="footer" class="dialog-footer">
                 <el-button @click="editDialogB = false">取 消</el-button>
                 <el-button type="primary" @click="ConfirmB('formInline')" :loading="listLoading" v-if="!finalize">确定</el-button>
-                <el-button type="primary" @click="ConfirmC()" :loading="listLoading" v-if="!finalize">合同定稿</el-button>
+                <!-- <el-button type="primary" @click="ConfirmC()" :loading="listLoading" v-if="!finalize">合同定稿</el-button> -->
+                <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="#E6A23C" title="合同定稿将无法再继续编辑 是否确认?" @confirm="ConfirmC()">
+                    <el-button slot="reference" :loading="listLoading" v-if="!finalize">合同定稿</el-button>
+                </el-popconfirm>
             </span>
         </el-dialog>
         <!-- 合同预览/下载 -->
@@ -629,7 +632,7 @@ import axios from 'axios'
                     if (valid) {
                         this.listLoading = true;
                         this.http.post('/contract-detail/update', {
-                            companyId:this.formInline.dialogData.id,
+                            companyId:this.dialogData.id,
                             secondParty:this.formInline.secondParty,
                             secondPartyAddr:this.formInline.secondPartyAddr,
                             secondPartyContacts:this.formInline.secondPartyContacts,
@@ -677,9 +680,9 @@ import axios from 'axios'
                 });
             },
             // 合同定稿
-            ConfirmC(){
+            ConfirmC(){ 
                 this.listLoading = true;
-                this.http.post('//contract-detail/finalize',{companyId:this.dialogData.id,},
+                this.http.post('/contract-detail/finalize',{companyId:this.dialogData.id,},
                 res => {
                     this.listLoading = false;
                     if (res.code == "ok") {