Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -81,7 +81,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>政策详情(含签单折让、开票下浮等)</div>
+            <div>政策详情(仅适用于陕汽品牌)</div>
             <el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
           </div>
           <el-row>
@@ -768,7 +768,7 @@ export default {
         return
       }
       if (this.formobj.departureDate === '') {
-        alert('厂家发车日期不能为空!')
+        alert('物流发车日期不能为空!')
         return
       }
       if (this.freightChecked) {

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@@ -79,7 +79,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>政策详情(含签单折让、开票下浮等)</div>
+            <div>政策详情(仅适用于陕汽品牌)</div>
             <el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
           </div>
           <el-row>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@@ -81,7 +81,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>政策详情(含签单折让、开票下浮等)</div>
+            <div>政策详情(仅适用于陕汽品牌)</div>
             <el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
           </div>
           <el-row>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -80,7 +80,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>政策详情(含签单折让、开票下浮等)</div>
+            <div>政策详情(仅适用于陕汽品牌)</div>
             <el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
           </div>
           <el-row>
@@ -789,7 +789,7 @@ export default {
         return
       }
       if (this.formobj.departureDate === '') {
-        alert('厂家发车日期不能为空!')
+        alert('物流发车日期不能为空!')
         return
       }
       if (this.freightChecked) {

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@@ -79,7 +79,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>政策详情(含签单折让、开票下浮等)</div>
+            <div>政策详情(仅适用于陕汽品牌)</div>
             <el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
           </div>
           <el-row>

anrui-system-ui/src/views/Home/Home.vue

@@ -365,23 +365,23 @@ export default {
         // this.$router.push({path: '/index'})
         let myPopup = window.open('/#/index', '_blank')
       } else if (index == '7') {
-        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '8') {
-        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '1') {
-        let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '4') {
-        let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '5') {
-        let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '0') {
-        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank')
       }
 //				const page = this.$router.resolve({name: name})
 //				window.open(page.href,'_blank')

anrui-system-ui/src/views/flow/doneList.vue

@@ -255,8 +255,8 @@ import flowRecords from '@/components/flow/flowRecord'
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
             // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            // this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
           } else {
             this.$notify({
               title: '提示',

anrui-system-ui/src/views/flow/todoList.vue

@@ -286,8 +286,8 @@ export default {
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
             // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            // this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             console.log('已办拼接url:',this.url)
           } else {
             this.$notify({

anrui-system-ui/src/views/userManage/userManageList.vue

@@ -7,9 +7,12 @@
             <el-form-item label="用户名">
               <el-input v-model="search.userName" clearable></el-input>
             </el-form-item>
+            <el-form-item label="姓名">
+              <el-input v-model="search.name" clearable></el-input>
+            </el-form-item>
             <el-form-item label="角色">
-              <el-select v-model="search.roleSid" clearable placeholder="请选择">
-                <el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option>
+              <el-select v-model="search.roleSid" filterable clearable placeholder="请选择">
+                <el-option v-for="item in roleListAll" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="部门">
@@ -204,6 +207,7 @@ export default {
       timer: null,
       roleListAll: [],
       search: {
+        name: '',
         userName: '',
         roleSid: ''
       },