修改营销中心

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="app-container">
-    <el-card style="background: rgb(233,240,250)">
+    <el-card>
+      <!--      style="background: rgb(233,240,250)"-->
       <div>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px 10px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin: 3px 10px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
@@ -118,63 +119,68 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="合同总额" prop="合同总额" width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ Number(scope.row.合同总金额).toFixed(2) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="付款方式" width="80">
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="100">
+        <el-table-column align="center" label="签订日期" width="100">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="图纸会签节点" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="设备预验收节点" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="发货节点" width="85">
-          <template slot-scope="scope">
-            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="安装调试节点" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="销售经理" width="85">
           <template slot-scope="scope">
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>
+        <!--        <el-table-column align="center" label="会签节点" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="预验收节点" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="发货节点" width="85">
           <template slot-scope="scope">
-            {{ scope.row.联系人 }}
+            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" width="120">
+        <!--        <el-table-column align="center" label="安装调试节点" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.联系人 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.电话 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="合同备注" width="120">
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="150">
+        <el-table-column label="操作" align="center" width="170">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-circle-plus-outline"
-              @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+              @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
@@ -210,37 +216,37 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-card v-show="ExecutionProgressShow">
-      <div>
-        <h4 style="display: inline-block;margin: 3px;">项目进度</h4>
-        <div style="display: inline-block; float:right">
-          <span>已完成进度：</span>
-          <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
-            <el-option
-              v-for="item in executionProgress"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-              :disabled ="item.disabled"/>
-          </el-select>
-        </div>
-      </div>
-      <div>
-        <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">
-          <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>
-          <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>
-          <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>
-          <el-step :description="time4" title="预备验收" icon="el-icon-view"/>
-          <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>
-          <el-step :description="time6" title="安装调试" icon="el-icon-time"/>
-          <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>
-          <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>
-        </el-steps>
-      </div>
-    </el-card>
+    <!--    <el-card v-show="ExecutionProgressShow">-->
+    <!--      <div>-->
+    <!--        <h4 style="display: inline-block;margin: 3px;">项目进度</h4>-->
+    <!--        <div style="display: inline-block; float:right">-->
+    <!--          <span>已完成进度：</span>-->
+    <!--          <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">-->
+    <!--            <el-option-->
+    <!--              v-for="item in executionProgress"-->
+    <!--              :key="item.value"-->
+    <!--              :label="item.label"-->
+    <!--              :value="item.value"-->
+    <!--              :disabled ="item.disabled"/>-->
+    <!--          </el-select>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <div>-->
+    <!--        <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">-->
+    <!--          <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>-->
+    <!--          <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>-->
+    <!--          <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>-->
+    <!--          <el-step :description="time4" title="预备验收" icon="el-icon-view"/>-->
+    <!--          <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>-->
+    <!--          <el-step :description="time6" title="安装调试" icon="el-icon-time"/>-->
+    <!--          <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>-->
+    <!--          <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>-->
+    <!--        </el-steps>-->
+    <!--      </div>-->
+    <!--    </el-card>-->
     <el-card v-show="uploader" style="min-height: 145px;">
       <h4 style="margin: 3px;">纪要文件</h4>
-      <div style="float: right;">
+      <div style="float: left;">
         <el-upload
           :action="action"
           :on-success="uploadSuccess"
@@ -283,7 +289,12 @@
               <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col v-show="isTrue" :span="12">
+            <el-form-item label="合同总额" prop="contractAmount">
+              <el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-show="false" :span="12" >
             <el-form-item label="已完成进度" prop="executionProgressID">
               <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
                 <el-option
@@ -570,6 +581,7 @@ export default {
   },
   data() {
     return {
+      isTrue: true,
       customerName1: '',
       customerName1_check: '',
       machineDATA: '',
@@ -659,7 +671,8 @@ export default {
         customerName: '', // 客户名称
         remark: '',
         付款方式: 1,
-        bidding: ''
+        bidding: '',
+        contractAmount: '' // 合同总额
       },
       tableDataBidding: [],
       executionProgressID: '',
@@ -682,7 +695,8 @@ export default {
         MarketingManagerValue: [{ required: true, message: '请选择营销经理', trigger: 'change' }],
         executionProgressID: [{ required: true, message: '请选择已完成进度', trigger: 'change' }],
         contractSigningDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
-        付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }]
+        付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }],
+        contractAmount: [{ required: true, message: '请输入合同总额', trigger: 'blur' }]
       },
       rules1: { // 表单验证规则
         设备型号: [{ required: true, message: '请输入设备型号', trigger: 'blur' }],
@@ -922,9 +936,10 @@ export default {
       this.disabled = false
       this.biddingNumber = ''
       this.tableDataBidding = []
+      this.isTrue = true
     },
     addTableData1() {
-      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
+      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
@@ -979,6 +994,7 @@ export default {
       this.form.bidding = row.招标企业
       this.disabled = true
       this.temp = 2
+      this.isTrue = false
     },
     chaEdit() {
       editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {