Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue

@@ -71,8 +71,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <div class="span-sty"><span>开票名称</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -82,6 +82,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -153,7 +159,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
     }
   },
@@ -270,7 +278,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()

anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue

@@ -67,8 +67,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <div class="span-sty"><span>开票名称</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -78,6 +78,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -147,7 +153,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
     }
   },
@@ -215,7 +223,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
       this.$emit('doback')
     }

anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuDaiBanInfo.vue

@@ -69,8 +69,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <div class="span-sty"><span>开票名称</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -80,6 +80,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -174,7 +180,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       },
       operation: '', // 点击操作按钮
       dialogList: {

anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuEdit.vue

@@ -70,8 +70,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <div class="span-sty"><span>开票名称</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -81,6 +81,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -152,7 +158,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
     }
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuYiBanInfo.vue

@@ -67,8 +67,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <div class="span-sty"><span>开票名称</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -78,6 +78,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -147,7 +153,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       },
       // 环节所需参数
       linkByParameter: {