Browse Source

1.机器设备作价页面修改

GouGengquan 7 months ago
parent
commit
14479392ac
1 changed files with 299 additions and 152 deletions
  1. 299 152
      src/views/assets/workbench/calculate/importInfo.vue

+ 299 - 152
src/views/assets/workbench/calculate/importInfo.vue

@@ -67,12 +67,14 @@
                         <span>设备名称</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptNameFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索" @change="getEqptTableFilter('equipmentName', null)" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('equipmentName', null)" style="margin-bottom:5px" />
                                 <el-checkbox v-for="equipmentName in equipmentNameFilters" style="display:block;"
                                     :label="equipmentName" :value="equipmentName" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -106,12 +108,14 @@
                         <span>型号规格</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptModelFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索" @change="getEqptTableFilter('model', null)" style="margin-bottom:5px"/>
-                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;"
-                                    :label="item" :value="item" size="small" />
+                                <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('model', null)" style="margin-bottom:5px" />
+                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item"
+                                    :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -136,12 +140,14 @@
                         <span>购买日期</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptPurchaseDateFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('purchaseDate', null)" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('purchaseDate', null)" style="margin-bottom:5px" />
                                 <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;"
                                     :label="item" :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -166,12 +172,14 @@
                         <span>启用日期</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptActivationDateFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('activationDate', null)" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('activationDate', null)" style="margin-bottom:5px" />
                                 <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;"
                                     :label="item" :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -200,6 +208,21 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
+                <el-table-column prop="usageSituation" label="使用情况" width="170" align="center">
+                    <template #default="{ row }">
+                        <el-form-item prop="usageSituation">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-select v-model="row.usageSituation" placeholder="使用情况"  filterable allow-create style="width:150px">
+                                    <el-option label="在用" value="在用"></el-option>
+                                    <el-option label="闲置" value="闲置"></el-option>
+                                    <el-option label="无实物" value="无实物"></el-option>
+                                    <el-option label="已损坏" value="已损坏"></el-option>
+                                    <el-option label="已报废" value="已报废"></el-option>
+                                </el-select>
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="quantity" label="数量" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="quantity">
@@ -236,26 +259,26 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="taxedUnitPrice" label="含税单价(元)" width="150" align="center">
+                <el-table-column prop="taxedUnitPrice" label="合同/发票含税单价(元)" width="190" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="taxedUnitPrice">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.taxedUnitPrice" placeholder="请输入含税单价"
+                                <el-input v-model="row.taxedUnitPrice" placeholder="含税单价"
                                     @change="countPrice(row, $index)" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="taxRate" label="税率" width="150" align="center">
+                <el-table-column prop="taxRate" label="购置时税率%" width="150" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="taxRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.taxRate" placeholder="请输入税率" @change="countPrice(row, $index)" />
+                                <el-input v-model="row.taxRate" placeholder="税率" @change="countPrice(row, $index)" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="unTaxedUnitPrice" label="不含税单价(元)" width="150" align="center">
+                <el-table-column prop="unTaxedUnitPrice" label="不含税单价/发票价(元)" width="190" align="center">
                     <template #default="{ row }">
                         <!-- 计算不含税单价 -->
                         <span>{{ row.unTaxedUnitPrice = (row.taxedUnitPrice / (1 + row.taxRate / 100)).toFixed(2)
@@ -266,23 +289,23 @@
                     <template #default="{ row }">
                         <el-form-item prop="remark">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.remark" placeholder="请输入备注" />
+                                <el-input v-model="row.remark" placeholder="备注" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
                 <el-table-column label="评估价值" width="300" align="center">
-                    <el-table-column prop="evaluateOriginalValue" label="原值(元)" width="100" align="center">
+                    <el-table-column prop="evaluateOriginalValue" label="原值(元)" width="120" align="center">
                         <template #default="{ row }">
                             <span>{{ row.evaluateOriginalValue = row.excludeTaxPrice }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="depreciationRate" label="成新率%" width="100" align="center">
+                    <el-table-column prop="depreciationRate" label="成新率%" width="120" align="center">
                         <template #default="{ row }">
                             <span>{{ row.depreciationRate = row.comprehensiveDepreciationRate }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="evaluateNetValue" label="净值(元)" width="100" align="center">
+                    <el-table-column prop="evaluateNetValue" label="净值(元)" width="120" align="center">
                         <template #default="{ row }">
                             <span>{{ row.evaluateNetValue = (row.evaluateOriginalValue * 1 *
                                 row.comprehensiveDepreciationRate /
@@ -290,18 +313,19 @@
                             }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="valueAddedRate" label="增值率" width="150" align="center">
+                    <el-table-column prop="valueAddedRate" label="增值率%" width="150" align="center">
                         <template #default="{ row }">
                             <el-form-item prop="valueAddedRate">
                                 <el-form :model="row" @submit.native.prevent>
-                                    <span>{{ row.valueAddedRate = ((row.evaluateOriginalValue * 1 - row.bookNetValue * 1) /
-                                        row.bookNetValue).toFixed(2) }}</span>
+                                    <span>{{ ((row.valueAddedRate = ((row.evaluateOriginalValue * 1 - row.bookNetValue * 1)
+                                        /
+                                        row.bookNetValue).toFixed(4)) * 100).toFixed(2) }}</span>
                                 </el-form>
                             </el-form-item>
                         </template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column label="年限成新率" width="300">
+                <el-table-column label="年限成新率%" width="300">
                     <el-table-column prop="economicServiceLife" label="经济使用年数" width="120" align="center">
                         <template #default="{ $index, row }">
                             <el-form-item prop="economicServiceLife">
@@ -312,7 +336,7 @@
                             </el-form-item>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="yearsInUse" label="已使用年数" width="100" align="center">
+                    <el-table-column prop="yearsInUse" label="已使用年数" width="120" align="center">
                         <template #default="{ row }">
                             <!-- 计算已使用年数 -->
                             <span>{{ row.yearsInUse = (getDaysBetween(row.activationDate,
@@ -320,7 +344,7 @@
                                 365).toFixed(2) }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="年限成新率" width="100" align="center">
+                    <el-table-column label="年限成新率%" width="120" align="center">
                         <template #default="{ row }">
                             <span>{{ row.depreciationRateByAge =
                             ((row.economicServiceLife - row.yearsInUse) / row.economicServiceLife < 0.15) ? 15 :
@@ -329,12 +353,12 @@
                         </template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop="weight01" label="权重" width="100" align="center">
+                <el-table-column prop="weight01" label="权重%" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.weight01 * 100 }}%</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="directObservationDepreciationRate" label="直接观察成新率" width="150" align="center">
+                <el-table-column prop="directObservationDepreciationRate" label="直接观察成新率%" width="150" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="directObservationDepreciationRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -343,12 +367,12 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="weight02" label="权重" width="100" align="center">
+                <el-table-column prop="weight02" label="权重%" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.weight02 * 100 }}%</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="综合成新率" width="100" align="center">
+                <el-table-column label="综合成新率%" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.comprehensiveDepreciationRate =
                         ((row.depreciationRateByAge * row.weight01 + row.directObservationDepreciationRate *
@@ -419,7 +443,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="price" label="单价(元)" width="150" align="center">
+                <el-table-column prop="price" label="询价单价(元)" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="price">
                             <el-form :model="row" @submit.native.prevent>
@@ -428,70 +452,70 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="quotation" label="报价(含税不含运费不含安装调试费)" width="100" align="center">
+                <el-table-column prop="quotation" label="报价(含税不含运费不含安装调试费)" width="200" align="center">
                     <template #default="{ row }">
                         <span>{{ row.quotation = row.price * row.quantity }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="freightAndMiscellaneousFeeRate" label="运杂费率" width="100" align="center">
+                <el-table-column prop="freightAndMiscellaneousFeeRate" label="运杂费率%" width="120" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="freightAndMiscellaneousFeeRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.freightAndMiscellaneousFeeRate" placeholder="运杂费率" />
+                                <el-input v-model="row.freightAndMiscellaneousFeeRate" placeholder="运杂费率%" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column label="运杂费(元)" width="100">
+                <el-table-column label="运杂费(元)" width="120">
                     <template #default="{ row }">
                         <span>{{ row.freightAndMiscellaneousFee = (row.quotation *
                             row.freightAndMiscellaneousFeeRate /
                             100).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="baseRate" label="基础费率" width="100" align="center">
+                <el-table-column prop="baseRate" label="基础费率%" width="120" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="baseRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.baseRate" placeholder="基础费率" />
+                                <el-input v-model="row.baseRate" placeholder="基础费率%" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column label="基础费(元)" width="100" align="center">
+                <el-table-column label="基础费(元)" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.baseFee = (row.quotation * row.baseRate / 100).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="installationRate" label="安装费率" width="100" align="center">
+                <el-table-column prop="installationRate" label="安装费率%" width="120" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="installationRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.installationRate" placeholder="安装费率" />
+                                <el-input v-model="row.installationRate" placeholder="安装费率%" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="installationFee" label="安装费(元)" width="100" align="center">
+                <el-table-column prop="installationFee" label="安装费(元)" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.installationFee = (row.quotation * row.installationRate / 100).toFixed(2)
                         }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="设备工程费(元)" width="100" align="center">
+                <el-table-column label="设备工程费(元)" width="140" align="center">
                     <template #default="{ row }">
                         <span>{{ row.equipmentEngineeringCosts = (row.quotation * 1 + row.freightAndMiscellaneousFee
                             * 1 +
                             row.baseFee * 1 + row.installationFee * 1).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="前期费(元)" width="100" align="center">
+                <el-table-column label="前期费(元)" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.initialFee = (row.equipmentEngineeringCosts *
                             calculateBaseInfo.preConstructionCostRatio / 100).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="资金成本(元)" width="100" align="center">
+                <el-table-column label="资金成本(元)" width="140" align="center">
                     <template #default="{ row }">
                         <span>{{ row.costOfCapital = countCostOfCapital(row) }}</span>
                     </template>
@@ -528,12 +552,14 @@
                         <span>设备名称</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptNameFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索" @change="getEqptTableFilter('equipmentName', '进口设备')" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('equipmentName', '进口设备')" style="margin-bottom:5px" />
                                 <el-checkbox v-for="equipmentName in equipmentNameFilters" style="display:block;"
                                     :label="equipmentName" :value="equipmentName" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getImpEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -558,12 +584,14 @@
                         <span>规格型号</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptModelFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索" @change="getEqptTableFilter('model', '进口设备')" style="margin-bottom:5px"/>
-                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;"
-                                    :label="item" :value="item" size="small" />
+                                <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('model', '进口设备')" style="margin-bottom:5px" />
+                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item"
+                                    :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getImpEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -615,12 +643,14 @@
                         <span>购置日期</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptPurchaseDateFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('purchaseDate', '进口设备')" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('purchaseDate', '进口设备')" style="margin-bottom:5px" />
                                 <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;"
                                     :label="item" :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getImpEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -645,12 +675,14 @@
                         <span>启用日期</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptActivationDateFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('activationDate', '进口设备')" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('activationDate', '进口设备')" style="margin-bottom:5px" />
                                 <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;"
                                     :label="item" :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getImpEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -679,6 +711,69 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
+                <el-table-column prop="productCode" label="商品编号" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="productCode">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.productCode" placeholder="商品编号" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="currency" label="合同结算币种" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="currency">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.currency" placeholder="币种" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="address" label="生产国/进口国" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="address">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.address" placeholder="地址" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="transactionMethod" label="成交方式" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="transactionMethod">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.transactionMethod" placeholder="成交方式" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="contractAmount" label="合同金额" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="contractAmount">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.contractAmount" placeholder="合同金额" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="contractSigningDate" label="合同签订日期" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="contractSigningDate">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.contractSigningDate" placeholder="合同签订日期" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="destinationPort" label="到岸港口" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="destinationPort">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.destinationPort" placeholder="到岸港口" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="ppi" label="价格指数" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="ppi">
@@ -712,38 +807,56 @@
                             </el-form-item>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="CIFLandedPrice" label="(CIF到岸价)折人民币" width="150">
+                    <el-table-column prop="CIFLandedPrice" label="(CIF到岸价)折人民币" width="180">
                         <template #default="{ row }">
                             <span>{{ row.CIFLandedPrice = (row.purchasePrice * row.centralParityRate).toFixed(0) }}</span>
                         </template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop="tariffRate" label="关税税率" width="150">
+                <el-table-column prop="tariffRate" label="关税税率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="tariffRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.tariffRate" placeholder="关税税率" />
+                                <el-input v-model="row.tariffRate" placeholder="关税税率%" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="tariffRatePicture" label="关税税率截图" width="300">
+                    <template #default="{ row, $index }">
+                        <el-form-item prop="tariffRatePicture">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.tariffRatePicture" placeholder="关税税率截图" style="width:220px" />
+                                <el-upload v-model:file-list="imageList" action="/pp/file/upload/image"
+                                    accept=".gif,.jpg,.jpeg,.jpg2,.png,.tif,.tiff,.bmp,.svg,.svgz,.webp" :limit="1"
+                                    :show-file-list="false" :on-success="(response, file, fileList) => {
+                                        return tariffRatePictureSuccess(response, file, fileList, $index);
+                                    }
+                                        " style="width: 50px;display: inline-block;margin-left:5px">
+                                    <el-button type="danger" size="small">图片</el-button>
+                                </el-upload>
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
                 <el-table-column prop="tariff" label="关税" width="150">
                     <template #default="{ row }">
-                        <span>{{ row.tariff = (row.CIFLandedPrice * row.tariffRate).toFixed(2) }}</span>
+                        <span>{{ row.tariff = (row.CIFLandedPrice * (row.tariffRate / 100)).toFixed(2) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="importVATRate" label="进口增值税率" width="150">
+                <el-table-column prop="importVATRate" label="进口增值税率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="importVATRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.importVATRate" placeholder="进口增值税率" />
+                                <el-input v-model="row.importVATRate" placeholder="进口增值税率%" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
                 <el-table-column prop="importVAT" label="进口增值税" width="150">
                     <template #default="{ row }">
-                        <span>{{ row.importVAT = ((row.CIFLandedPrice * 1 + row.tariff * 1) * row.importVATRate).toFixed(2)
+                        <span>{{ row.importVAT = ((row.CIFLandedPrice * 1 + row.tariff * 1) * (row.importVATRate /
+                            100)).toFixed(2)
                         }}</span>
                     </template>
                 </el-table-column>
@@ -753,32 +866,33 @@
                         }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="bankChargesRate" label="银行财务费率" width="150">
+                <el-table-column prop="bankChargesRate" label="银行财务费率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="bankChargesRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.bankChargesRate" placeholder="银行财务费率" />
+                                <el-input v-model="row.bankChargesRate" placeholder="银行财务费率%" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
                 <el-table-column prop="bankCharges" label="银行财务费" width="150">
                     <template #default="{ row }">
-                        <span>{{ row.bankCharges = (row.CIFLandedPrice * row.bankChargesRate).toFixed(2) }}</span>
+                        <span>{{ row.bankCharges = (row.CIFLandedPrice * (row.bankChargesRate / 100)).toFixed(2) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="foreignTransactionRate" label="外贸手续费率" width="150">
+                <el-table-column prop="foreignTransactionRate" label="外贸手续费率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="foreignTransactionRate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.foreignTransactionRate" placeholder="外贸手续费率" />
+                                <el-input v-model="row.foreignTransactionRate" placeholder="外贸手续费率%" />
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
                 <el-table-column prop="foreignTransaction" label="外贸手续费" width="150">
                     <template #default="{ row }">
-                        <span>{{ row.foreignTransaction = (row.CIFLandedPrice * row.foreignTransactionRate).toFixed(2)
+                        <span>{{ row.foreignTransaction = (row.CIFLandedPrice * (row.foreignTransactionRate /
+                            100)).toFixed(2)
                         }}</span>
                     </template>
                 </el-table-column>
@@ -792,69 +906,6 @@
                         <span>{{ row.originalPrice = (row.eqptPrice * 1 + row.totalFees * 1).toFixed(2) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="productCode" label="商品编号" width="150">
-                    <template #default="{ row }">
-                        <el-form-item prop="productCode">
-                            <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.productCode" placeholder="商品编号" />
-                            </el-form>
-                        </el-form-item>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="currency" label="币种" width="150">
-                    <template #default="{ row }">
-                        <el-form-item prop="currency">
-                            <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.currency" placeholder="币种" />
-                            </el-form>
-                        </el-form-item>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="address" label="地址" width="150">
-                    <template #default="{ row }">
-                        <el-form-item prop="address">
-                            <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.address" placeholder="地址" />
-                            </el-form>
-                        </el-form-item>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="transactionMethod" label="成交方式" width="150">
-                    <template #default="{ row }">
-                        <el-form-item prop="transactionMethod">
-                            <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.transactionMethod" placeholder="成交方式" />
-                            </el-form>
-                        </el-form-item>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="contractAmount" label="合同金额" width="150">
-                    <template #default="{ row }">
-                        <el-form-item prop="contractAmount">
-                            <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.contractAmount" placeholder="合同金额" />
-                            </el-form>
-                        </el-form-item>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="contractSigningDate" label="合同签订日期" width="150">
-                    <template #default="{ row }">
-                        <el-form-item prop="contractSigningDate">
-                            <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.contractSigningDate" placeholder="合同签订日期" />
-                            </el-form>
-                        </el-form-item>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="destinationPort" label="到岸港口" width="150">
-                    <template #default="{ row }">
-                        <el-form-item prop="destinationPort">
-                            <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.destinationPort" placeholder="到岸港口" />
-                            </el-form>
-                        </el-form-item>
-                    </template>
-                </el-table-column>
                 <el-table-column fixed="right" label="操作" min-width="55">
                     <template #default="{ row }">
                         <el-button link type="primary" size="small" @click="saveImp(row)">保存</el-button>
@@ -885,12 +936,14 @@
                         <span>设备名称</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptNameFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索" @change="getEqptTableFilter('equipmentName', '非标设备')" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('equipmentName', '非标设备')" style="margin-bottom:5px" />
                                 <el-checkbox v-for="equipmentName in equipmentNameFilters" style="display:block;"
                                     :label="equipmentName" :value="equipmentName" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getNonSEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -915,12 +968,14 @@
                         <span>规格型号</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptModelFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索" @change="getEqptTableFilter('model', '非标设备')" style="margin-bottom:5px"/>
-                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;"
-                                    :label="item" :value="item" size="small" />
+                                <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('model', '非标设备')" style="margin-bottom:5px" />
+                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item"
+                                    :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getNonSEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -981,12 +1036,14 @@
                         <span>购置日期</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptPurchaseDateFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('purchaseDate', '非标设备')" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('purchaseDate', '非标设备')" style="margin-bottom:5px" />
                                 <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;"
                                     :label="item" :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getNonSEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -1011,12 +1068,14 @@
                         <span>启用日期</span>
                         <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
                             <el-checkbox-group v-model="eqptActivationDateFilterArr" style="overflow: auto;height: 300px">
-                                <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('activationDate','非标设备')" style="margin-bottom:5px"/>
+                                <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索"
+                                    @change="getEqptTableFilter('activationDate', '非标设备')" style="margin-bottom:5px" />
                                 <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;"
                                     :label="item" :value="item" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
-                                <el-button size="small" text @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
+                                <el-button size="small" text
+                                    @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
                                 <el-button size="small" type="primary" @click="getNonSEqptDataPage()">筛选</el-button>
                             </div>
                             <template #reference>
@@ -1083,16 +1142,93 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
+                <el-table-column prop="material1" label="主材1" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material1">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material1" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="material1Quantity" label="主材1用量" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material1Quantity">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material1Quantity" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="material1UseRatio" label="主材1利用率%" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material1UseRatio">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material1UseRatio" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="material1Price" label="主材1单价(元/吨)" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material1Price">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material1Price" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="material2" label="主材2" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material2">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material2" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="material2Quantity" label="主材2用量" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material2Quantity">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material2Quantity" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="material2UseRatio" label="主材2利用率%" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material2UseRatio">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material2UseRatio" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="material2Price" label="主材2单价(元/吨)" width="150">
+                    <template #default="{ row }">
+                        <el-form-item prop="material2Price">
+                            <el-form :model="row" @submit.native.prevent>
+                                <el-input v-model="row.material2Price" />
+                            </el-form>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="mainMaterialCost" label="主材费/设备报价(含税不含运费不含安装调试费)" width="250">
                     <template #default="{ row }">
-                        <el-form-item prop="mainMaterialCost">
+                        <!-- <el-form-item prop="mainMaterialCost">
                             <el-form :model="row" @submit.native.prevent>
                                 <el-input v-model="row.mainMaterialCost" />
                             </el-form>
-                        </el-form-item>
+                        </el-form-item> -->
+                        <span>{{ row.mainMaterialCost = isNaN((row.material1Quantity / (row.material1UseRatio / 100) *
+                            row.material1Price + row.material2Quantity / (row.material2UseRatio / 100) *
+                            row.material2Price).toFixed(0)) ? 0 : (row.material1Quantity / (row.material1UseRatio / 100) *
+                                row.material1Price + row.material2Quantity / (row.material2UseRatio / 100) *
+                                row.material2Price).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="mainMaterialCostRate" label="不含主要外购件费的成本主材费率" width="150">
+                <el-table-column prop="mainMaterialCostRate" label="不含主要外购件费的成本主材费率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="mainMaterialCostRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -1110,7 +1246,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="costProfitRatio" label="成本利润率" width="150">
+                <el-table-column prop="costProfitRatio" label="成本利润率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="costProfitRatio">
                             <el-form :model="row" @submit.native.prevent>
@@ -1119,7 +1255,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="salesTaxRate" label="销售税金率" width="150">
+                <el-table-column prop="salesTaxRate" label="销售税金率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="salesTaxRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -1128,7 +1264,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="designFeeRate" label="非标准设备设计费率" width="150">
+                <el-table-column prop="designFeeRate" label="非标准设备设计费率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="designFeeRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -1137,7 +1273,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="VATRate" label="增值税率" width="150">
+                <el-table-column prop="VATRate" label="增值税率%" width="150">
                     <template #default="{ row }">
                         <el-form-item prop="VATRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -1148,12 +1284,13 @@
                 </el-table-column>
                 <el-table-column prop="nonsEqptValue" label="非标设备估值" width="150">
                     <template #default="{ row }">
-                        <span>{{ row.nonsEqptValue = isNaN(((row.mainMaterialCost / (row.mainMaterialCostRate / 100) +
-                            row.mainPurchasedPartsCost * 1) * (1 + row.costProfitRatio / 100 * 1) * (1 + row.salesTaxRate /
+                        <span>{{ row.nonsEqptValue = (row.mainMaterialCostRate == null ? 0 : isNaN(((row.mainMaterialCost /
+                            (row.mainMaterialCostRate / 100) +
+                            row.mainPurchasedPartsCost * 1) * (1 + row.costProfitRatio / 100) * (1 + row.salesTaxRate /
                                 100) * (1 + row.designFeeRate / 100) / (1 + row.VATRate / 100)).toFixed(0)) ? 0 :
                             ((row.mainMaterialCost / (row.mainMaterialCostRate / 100) + row.mainPurchasedPartsCost * 1) * (1
-                                + row.costProfitRatio / 100 * 1) * (1 + row.salesTaxRate / 100) * (1 + row.designFeeRate / 100)
-                                / (1 + row.VATRate / 100)).toFixed(0) }}</span>
+                                + row.costProfitRatio / 100) * (1 + row.salesTaxRate / 100) * (1 + row.designFeeRate / 100)
+                                / (1 + row.VATRate / 100)).toFixed(0)) }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column fixed="right" label="操作" min-width="55">
@@ -1359,6 +1496,17 @@ export default {
                 type: 'success'
             })
         },
+        // 进口设备税率截图上传成功回调
+        tariffRatePictureSuccess(res, file, fileList, $index) {
+            this.imageList = [];
+            console.log(this.eqptImpPageData[$index])
+            this.eqptImpPageData[$index].tariffRatePicture = res.data;
+            ElMessage({
+                showClose: true,
+                message: res.message,
+                type: 'success'
+            })
+        },
         // 分页查询导入的机器设备测算数据
         getEqptDataPage() {
             this.eqptDataQuery.eqptNameFilters = this.eqptNameFilterArr.join();
@@ -1740,5 +1888,4 @@ export default {
 /* 将tap的下划线移动到顶部 */
 :deep(.el-tabs__active-bar) {
     margin-bottom: 35px !important;
-}
-</style>
+}</style>