wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
DouDou 1 year ago
parent
9ba48d3c5c d0ab9126ec
commit
6d1d34b34c
4 changed files with 1 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/views/modules/proofing/requestForProofing.vue
  2. 157
      src/views/modules/quotation/requestForQuote.vue
  3. 9
      src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue
  4. 7
      src/views/modules/test/requestForTest.vue

7
src/views/modules/proofing/requestForProofing.vue
View File

@ -521,13 +521,6 @@
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple">
<el-form-item label="项目状态">
<el-input v-model="projectInformationData.status" readonly></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">

157
src/views/modules/quotation/requestForQuote.vue
View File

@ -618,13 +618,6 @@
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple">
<el-form-item label="项目状态">
<el-input v-model="projectInformationData.status" readonly></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
@ -702,156 +695,6 @@
<!-- 客户信息页签 -->
<el-tab-pane label="客户信息" name="customer_information">
<customer-info :project="quotationCurrentRow"></customer-info>
<!-- <el-form label-position="top" :model="customerInformationData"-->
<!-- style="margin-left: 10px;margin-top: 5px;margin-right: 10px">-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户代码">-->
<!-- <el-input v-model="customerInformationData.customerNo" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户名称">-->
<!-- <el-input v-model="customerInformationData.customerDesc" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="重要程度">-->
<!-- <el-input v-model="customerInformationData.importantCustomer" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户币种">-->
<!-- <el-input v-model="customerInformationData.customerCurrency" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="年营业额">-->
<!-- <el-input v-model="customerInformationData.turnoverOfYear" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="年潜在投入">-->
<!-- <el-input v-model="customerInformationData.potentialRevenueOfYear" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户状态">-->
<!-- <el-input v-model="customerInformationData.customerStatus" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="行业">-->
<!-- <el-input v-model="customerInformationData.customerIndustry" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="公司名称">-->
<!-- <el-input v-model="customerInformationData.companyName" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户联系人">-->
<!-- <el-input v-model="customerInformationData.contactName" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="联系人电话">-->
<!-- <el-input v-model="customerInformationData.contactPhoneNumber1" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="联系人职务">-->
<!-- <el-input v-model="customerInformationData.position" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户描述">-->
<!-- <el-input v-model="customerInformationData.customerDescription" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户联系地址">-->
<!-- <el-input v-model="customerInformationData.addressName" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="地址类型">-->
<!-- <el-input v-model="customerInformationData.addressType" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="6">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="创建时间">-->
<!-- <el-input v-model="customerInformationData.createDate" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="创建人">-->
<!-- <el-input v-model="customerInformationData.createBy" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="更新时间">-->
<!-- <el-input v-model="customerInformationData.updateDate" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="更新人">-->
<!-- <el-input v-model="customerInformationData.updateBy" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
</el-tab-pane>
<el-tab-pane label="报价明细" name="quote_detail" >
<inquiry-quote-detail :quotation="quotationCurrentRow"></inquiry-quote-detail>

9
src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="mode-config">
<el-form label-position="top" :model="projectInformationData" style="margin-left: 10px;margin-top: 5px;margin-right: 10px;width: 60%">
<el-form label-position="top" :model="projectInformationData">
<el-row :gutter="20">
<el-col :span="8">
<div class="grid-content bg-purple">
@ -39,13 +39,6 @@
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple">
<el-form-item label="项目状态">
<el-input v-model="projectInformationData.status" readonly></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">

7
src/views/modules/test/requestForTest.vue
View File

@ -609,13 +609,6 @@
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple">
<el-form-item label="项目状态">
<el-input v-model="projectInformationData.status" readonly></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">

Write Preview
Loading…
Cancel
Save