Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

src/views/ManufacturingCenter/ProcessPlanning/index.vue

@@ -15,7 +15,7 @@
           :value="item.value"/>
       </el-select>
       <span>零件号:</span>
-      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts();searchDetail()">
+      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
@@ -175,6 +175,7 @@
       <el-table
         v-loading="loading0"
         :data="tableData"
+        class="processTable"
         border
         style="width: 100%;max-height: 550px;"
         size="mini"
@@ -185,7 +186,6 @@
             <el-input
               v-model="scope.row.工艺名称"
               :disabled="disabled"
-              size="mini"
               readonly
               style="width:200px"
               @dblclick.native="tableSearch(scope.$index)"/>
@@ -196,7 +196,6 @@
             <el-select
               v-model="scope.row.工艺难度等级"
               :disabled="disabled"
-              size="mini"
               @change="hardEdit(scope.row)">
               <el-option v-for="item in hard" :key="item.value" :label="item.label" :value="item.value">
                 <span style="color: #8492a6; font-size: 13px">{{ item.value }}</span>
@@ -210,7 +209,6 @@
               v-model="scope.row.工艺要求"
               :rows="1"
               :disabled="disabled"
-              size="mini"
               type="textarea"
               @dblclick.native="tableSearch(scope.$index)"
               @change="requestEdit(scope.row)"/>
@@ -221,25 +219,21 @@
             <div>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-arrow-up"
                 type="primary"
                 @click="upOne(scope.row)"/>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-arrow-down"
                 type="primary"
                 @click="downOne(scope.row)"/>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-circle-plus-outline"
                 type="primary"
                 @click="insertOne(scope.row)"/>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-delete"
                 type="danger"
                 @click="deleteOne(scope.row)"/>
@@ -1451,3 +1445,15 @@ export default {
     background: oldlace;
   }
 </style>
+<style lang="scss">
+    .processTable{
+        .el-input__inner{
+            font-weight: bold;
+            font-size: 20px;
+        }
+        .el-textarea__inner{
+            font-weight: bold;
+            font-size: 20px;
+        }
+    }
+</style>

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -212,8 +212,8 @@ export default {
         this.partName = ''
         this.batchNum = ''
         this.material = ''
-        this.personValue = ''
         this.tableData = [] // 清主表
+        this.personChange()
       } else { // 未编制
         this.shuliang = ''
         this.isShow = false
@@ -224,7 +224,6 @@ export default {
         this.partName = ''
         this.batchNum = ''
         this.material = ''
-        this.personValue = ''
         this.tableData = [] // 清主表
         getPartnames1().then(response => {
           for (let i = 0; i < response.data.length; i++) {

src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue

@@ -187,19 +187,19 @@
                   {{ scope.row.付款方式 }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="合同总金额（元）" width="150">
+              <el-table-column align="center" label="合同总金额（万元）" width="150">
                 <template slot-scope="scope">
-                  {{ scope.row.合同总金额 }}
+                  {{ scope.row.合同总金额.toFixed(2) }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="已到账金额（元）" width="150">
+              <el-table-column align="center" label="已到账金额（万元）" width="150">
                 <template slot-scope="scope">
-                  {{ scope.row.已支付 }}
+                  {{ scope.row.已支付.toFixed(2) }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="未到账金额（元）" width="150">
+              <el-table-column align="center" label="未到账金额（万元）" width="150">
                 <template slot-scope="scope">
-                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
+                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额.toFixed(2) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="付款进度" width="150">

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -683,7 +683,7 @@ export default {
 
 <style>
   .el-table .warning-row {
-    background: oldlace;
+    background: red;
   }
 </style>
 

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -640,7 +640,7 @@ export default {
 
 <style>
   .el-table .warning-row {
-    background: oldlace;
+    background: red;
   }
   .rgb196{
     background: palevioletred;