Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue

@@ -45,7 +45,8 @@
           </el-table-column>
           <el-table-column prop="nodeState" width="100px;"  label="状态" align="center" >
             <template slot-scope="scope">
-              <span @click="flowRecord(scope.row)" style="color: #018ad2;cursor: pointer;">{{scope.row.nodeState}}</span>
+              <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini" >待提交</span>
+              <span v-else @click="flowRecord(scope.row)" style="color: #018ad2;cursor: pointer;">{{scope.row.nodeState}}</span>
             </template>
           </el-table-column>
 					<el-table-column prop="applicationDate" width="110px;" label="申请日期" align="center" />
@@ -185,7 +186,7 @@ export default {
         procInsId: row.procInstSid,
         token : getStorage()
       }
-      this.url = 'http://127.0.0.1:9530/portal/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+      this.url = 'http://120.46.131.15/portal/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
 		resetState() {
 			this.viewState = 1