提交代码

src/views/invoice/formalInvoiceManage.vue

@@ -5,19 +5,19 @@
         <span>买受人</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
+        <el-input style="width: 100%" v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>房屋</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input v-model="search.houseName" @keyup.enter.native="handleSearch()" />
+        <el-input style="width: 100%" v-model="search.houseName" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>推送状态</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-select v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
+        <el-select style="width: 100%" v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
           <el-option
             v-for="item in dc_data.SEND_STATUS"
             :key="item.value"
@@ -31,6 +31,7 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-select
+            style="width: 100%"
           v-model="search.invoiceStatus"
           filterable
           popper-class="statistic_base"
@@ -50,6 +51,7 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
+            style="width: 100%"
           v-model="search.sendDateFrom"
           popper-class="statistic_base"
           type="date"
@@ -58,10 +60,11 @@
         />
       </el-col>
       <el-col :span="1">
-        <span>至</span>
+        <div style="width: 100%;text-align: center">至</div>
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
+            style="width: 100%"
           v-model="search.sendDateTo"
           popper-class="statistic_base"
           type="date"
@@ -74,6 +77,7 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
+            style="width: 100%"
           v-model="search.invoiceDateFrom"
           popper-class="statistic_base"
           type="date"
@@ -82,10 +86,11 @@
         />
       </el-col>
       <el-col :span="1">
-        <span>至</span>
+        <div style="width: 100%;text-align: center">至</div>
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
+            style="width: 100%"
           v-model="search.invoiceDateTo"
           popper-class="statistic_base"
           type="date"

src/views/invoice/invoiceManage.vue

@@ -5,19 +5,19 @@
         <span>买受人</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
+        <el-input style="width: 100%" v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>房屋</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input v-model="search.houseName" @keyup.enter.native="handleSearch()" />
+        <el-input style="width: 100%" v-model="search.houseName" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>推送状态</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-select v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
+        <el-select style="width: 100%" v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
           <el-option
             v-for="item in dc_data.SEND_STATUS"
             :key="item.value"
@@ -31,6 +31,7 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-select
+            style="width: 100%"
           v-model="search.invoiceStatus"
           filterable
           popper-class="statistic_base"
@@ -51,6 +52,7 @@
       <el-col :span="4" class="col-input">
         <el-date-picker
           v-model="search.sendDateFrom"
+          style="width: 100%"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -58,11 +60,13 @@
         />
       </el-col>
       <el-col :span="1">
-        <span>至</span>
+        <div style="width: 100%;text-align: center">至</div>
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
           v-model="search.sendDateTo"
+
+          style="width: 100%"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -77,18 +81,20 @@
           v-model="search.invoiceDateFrom"
           popper-class="statistic_base"
           type="date"
+          style="width: 100%"
           placeholder="年月日"
           value-format="yyyy-MM-dd"
         />
       </el-col>
       <el-col :span="1">
-        <span>至</span>
+        <div style="width: 100%;text-align: center">至</div>
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
           v-model="search.invoiceDateTo"
           popper-class="statistic_base"
           type="date"
+          style="width: 100%"
           placeholder="年月日"
           value-format="yyyy-MM-dd"
         />
@@ -206,7 +212,7 @@ export default {
             loading: false,
             // 弹框相关
             dialogVisible: false,
-            dialogTitle: '新增',
+            dialogTitle: '新增'
         }
     },
     mounted() {

src/views/workflow/components/myProcess/paymentCanvas.vue

@@ -34,14 +34,14 @@ const node = [ // 节点
         symbolSize: [110, 60]
     },
     {
-        nodeKey: 'dept_superior_1_0_1',
+        nodeKey: 'dept_head_1_0_1',
         name: '部门负责人审核',
         value: [125, 100],
         symbol: 'image://' + require('../asste/huifangkuai.png'),
         symbolSize: [110, 60]
     },
     {
-        nodeKey: 'dept_head_1_0_1',
+        nodeKey: 'flow_cwld_1_0_1',
         name: '财务负责人审核',
         value: [205, 100],
         symbol: 'image://' + require('../asste/huifangkuai.png'),
@@ -160,12 +160,12 @@ const linesData = [ // 连线
         coords: [[45, 100], [105, 100]]
     },
     {
-        nodeKey: 'dept_superior_1_0_1',
+        nodeKey: 'dept_head_1_0_1',
         lineStyle: lineStyle,
         coords: [[125, 100], [185, 100]]
     },
     {
-        nodeKey: 'dept_head_1_0_1',
+        nodeKey: 'flow_cwld_1_0_1',
         lineStyle: lineStyle,
         coords: [[205, 100], [265, 100]]
     },
@@ -209,14 +209,14 @@ const linesData = [ // 连线
     },
     {
 
-        nodeKey: 'dept_head_1_0_1_back',
+        nodeKey: 'flow_cwld_1_0_1_back',
         lineStyle: lineStyle,
         coords: [[210, 100], [210, 250]],
         symbol: 'none'
     },
     {
 
-        nodeKey: 'dept_superior_1_0_1_back',
+        nodeKey: 'dept_head_1_0_1_back',
         lineStyle: lineStyle,
         coords: [[130, 100], [130, 200]],
         symbol: 'none'
@@ -245,13 +245,13 @@ const linesData = [ // 连线
         symbol: 'none'
     },
     {
-        nodeKey: 'dept_head_1_0_1_back',
+        nodeKey: 'flow_cwld_1_0_1_back',
         lineStyle: lineStyle,
         coords: [[50, 100], [50, 250]],
         symbol: 'none'
     },
     {
-        nodeKey: 'dept_superior_1_0_1_back',
+        nodeKey: 'dept_head_1_0_1_back',
         lineStyle: lineStyle,
         coords: [[50, 100], [50, 200]],
         symbol: 'none'
@@ -278,14 +278,14 @@ const linesData = [ // 连线
     },
     {
 
-        nodeKey: 'dept_head_1_0_1_back',
+        nodeKey: 'flow_cwld_1_0_1_back',
         lineStyle: lineStyle,
         coords: [[210, 250], [50, 250]],
         symbol: 'none'
     },
     {
 
-        nodeKey: 'dept_superior_1_0_1_back',
+        nodeKey: 'dept_head_1_0_1_back',
         lineStyle: lineStyle,
         coords: [[130, 200], [50, 200]],
         symbol: 'none'
@@ -334,7 +334,7 @@ export default {
                             this.getLineStyle(data[i].nodeKey)
                         }
                         break
-                    case 'dept_superior_1_0_1':
+                    case 'dept_head_1_0_1':
                         if (data[i].type == 1 || data[i].type == 3) {
                             this.getImgUrl(index, data[i].type)
                         }
@@ -342,11 +342,11 @@ export default {
                             this.getLineStyle(data[i].nodeKey)
                         }
                         if (data[i].type == 2) {
-                            this.getLineStyle('dept_superior_1_0_1_back')
+                            this.getLineStyle('dept_head_1_0_1_back')
                             this.getImgUrl(index, data[i].type)
                         }
                         break
-                    case 'dept_head_1_0_1':
+                    case 'flow_cwld_1_0_1':
                         if (data[i].type == 1 || data[i].type == 3) {
                             this.getImgUrl(index, data[i].type)
                         }
@@ -354,7 +354,7 @@ export default {
                             this.getLineStyle(data[i].nodeKey)
                         }
                         if (data[i].type == 2) {
-                            this.getLineStyle('dept_head_1_0_1_back')
+                            this.getLineStyle('flow_cwld_1_0_1_back')
                             this.getImgUrl(index, data[i].type)
                         }
                         if (data[i].isPass == '1') {
@@ -435,8 +435,7 @@ export default {
             if (index == -1) return
             switch (type) {
                 case '1':
-                    console.log(index)
-                    console.log(this.node[index])
+
                     this.node[index].symbol = 'image://' + require('../asste/lanfangkuai.png')
                     break
                 case '2':