Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/api/WorkshopProcurement/ReceiptConnectionSheet.js

@@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) {
     }
   })
 }
-// 传送人接收人初始化 采购科改16
+// 传送人接收人初始化
 export function initPerson() {
   return request({
     url: '',
@@ -57,7 +57,7 @@ export function initPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=16'
+      param: '考核部门编号=9'
     }
   })
 }

src/views/ManufacturingCenter/ProcessingStatus/index.vue

@@ -554,7 +554,7 @@ export default {
     background-color: transparent;
     border: 0px solid white;
   }
-  .green{
+  .lightgreen{
     background-color: lightgreen;
     border: 1px solid #1f2d3d;
   }

src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue

@@ -724,7 +724,7 @@ export default {
     background-color: transparent;
     border: 0px solid white;
   }
-  .green{
+  .lightgreen{
     background-color: lightgreen;
     border: 1px solid #1f2d3d;
   }

src/views/WorkshopProcurement/ArrivalStateSearch/index.vue

@@ -73,7 +73,7 @@
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="parseFloat((100*scope.row.合同物料到货总数/scope.row.合同物料采购总数).toFixed(2))"
+              :percentage="(parseInt(10000*(scope.row.合同物料到货总数)/scope.row.合同物料采购总数)) / 100"
               status="success"/>
           </template>
         </el-table-column>

src/views/WorkshopProcurement/InvoiceStateSearch/index.vue

@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column align="center" label="到票情况" min-width="200px">
           <template slot-scope="scope">
-            <el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.剩余总金额).toFixed(2)" status="success"/>
+            <el-progress :text-inside="true" :stroke-width="18" :percentage="(parseInt(10000*(scope.row.到票总金额)/scope.row.剩余总金额)) / 100" status="success"/>
           </template>
         </el-table-column>
       </el-table>
@@ -178,6 +178,7 @@ export default {
       })
     },
     searchTable1() {
+      this.tableData2 = []
       this.contractNum ? this.check1 = 1 : this.check1 = 0
       this.supplierName ? this.check2 = 1 : this.check2 = 0
       searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {