流程办理、代办、home页面，存放地点、采购退库业务表单页面

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

@@ -35,26 +35,26 @@
             </el-select>
           </el-col>
           <el-col :span="3">
-            <span>目标存放地点</span>
+            <span><span class="icon">*</span>车架号</span>
           </el-col>
           <el-col :span="9">
-            <el-select v-model="temp.targetLocation" placeholder="请选择" clearable class="addinputw"
+            <el-form-item prop="vinNo">
-                       @change="targetLocationChange">
+              <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
-              <el-option v-for="item in warehouwarehouse_list" :key="item.dictKey" :label="item.dictValue"
+                <el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>
-                         :value="item.dictValue"/>
+              </el-select>
-            </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span><span class="icon">*</span>车架号</span>
+            <span>目标存放地点</span>
           </el-col>
           <el-col :span="21">
-            <el-form-item prop="vinNo">
+            <el-select v-model="temp.targetLocation" placeholder="请选择" clearable class="addinputw"
-              <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
+                       @change="targetLocationChange">
-                <el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>
+              <el-option v-for="item in warehouwarehouse_list" :key="item.dictKey" :label="item.dictValue"
-              </el-select>
+                         :value="item.dictValue"/>
-            </el-form-item>
+            </el-select>
           </el-col>
         </el-row>
         <el-row>

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue

@@ -31,21 +31,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>目标存放地点</span>
+            <span>车架号</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ temp.targetLocation }}</span>
+              <span>{{ temp.vinNo }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>车架号</span>
+            <span>目标存放地点</span>
           </el-col>
           <el-col :span="21">
             <el-form-item>
-              <span>{{ temp.vinNo }}</span>
+              <span>{{ temp.targetLocation }}</span>
             </el-form-item>
           </el-col>
         </el-row>

anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue

@@ -169,21 +169,21 @@
           comment: '',
           instanceId: '',
           taskId: '',
-          userSid: '' // window.sessionStorage.getItem('userSid')
+          userSid:  window.sessionStorage.getItem('userSid')
         },
         regectList: { // 驳回列表
           businessSid: '',
           comment: '',
           instanceId: '',
           taskId: '',
-          userSid: '' // window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid')
         },
         stopList: { // 终止列表
           businessSid: '',
           comment: '',
           instanceId: '',
           taskId: '',
-          userSid: '' // window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid')
         },
         obj:{},
         rules: {},
@@ -205,18 +205,15 @@
       this.agreeList.taskId = obj.taskId
       this.agreeList.taskDefKey = obj.taskDefKey
       this.agreeList.taskName = obj.taskName
-      this.agreeList.userSid = obj.userSid
 
       // 驳回列表
       this.regectList.businessSid = obj.businessSid
       this.regectList.instanceId = obj.instanceId
       this.regectList.taskId = obj.taskId
-      this.regectList.userSid = obj.userSid
       // 终止列表
       this.stopList.businessSid = obj.businessSid
       this.stopList.instanceId = obj.instanceId
       this.stopList.taskId = obj.taskId
-      this.stopList.userSid = obj.userSid
       window.parent.postMessage({
         cmd: 'returnHeight',
         params: {

anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue

@@ -154,7 +154,7 @@
           comment: '',
           instanceId: '',
           taskId: '',
-          userSid: '' // window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid')
         },
         rules: {},
         submitdisabled: false, // 保存按钮
@@ -174,7 +174,6 @@
       this.stopList.businessSid = obj.businessSid
       this.stopList.instanceId = obj.instanceId
       this.stopList.taskId = obj.taskId
-      this.stopList.userSid = obj.userSid
       window.parent.postMessage({
         cmd: 'returnHeight',
         params: {

anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue

@@ -113,7 +113,7 @@
           businessSid: '',
           instanceId: '',
           taskId: '',
-          userSid: '' // window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid')
         },
         obj:{},
         rules: {},
@@ -137,7 +137,6 @@
       this.revokeList.businessSid = obj.businessSid
       this.revokeList.instanceId = obj.instanceId
       this.revokeList.taskId = obj.taskId
-      this.revokeList.userSid = obj.userSid
 
       window.parent.postMessage({
         cmd: 'returnHeight',

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue

@@ -34,21 +34,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <span>目标存放地点</span>
+              <span>车架号</span>
             </el-col>
             <el-col :span="9">
               <el-form-item>
-                <span>{{ temp.targetLocation }}</span>
+                <span>{{ temp.vinNo }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3">
-              <span>车架号</span>
+              <span>目标存放地点</span>
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                <span>{{ temp.vinNo }}</span>
+                <span>{{ temp.targetLocation }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -243,20 +243,20 @@ export default {
     this.agreeList.instanceId = obj.instanceId
     this.agreeList.taskId = obj.taskId
     this.agreeList.taskDefKey = obj.taskDefKey
-    this.agreeList.userSid = obj.userSid // window.sessionStorage.getItem('userSid')
+    this.agreeList.userSid =  window.sessionStorage.getItem('userSid')
-    this.agreeList.orgSidPath = obj.orgSidPath // window.sessionStorage.getItem('orgSidPath')
+    this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName
     // 驳回列表
     this.regectList.businessSid = obj.businessSid
     this.regectList.instanceId = obj.instanceId
     this.regectList.taskId = obj.taskId
-    this.regectList.userSid = obj.userSid // window.sessionStorage.getItem('userSid')
+    this.regectList.userSid = window.sessionStorage.getItem('userSid')
     // 终止列表
     this.stopList.businessSid = obj.businessSid
     this.stopList.instanceId = obj.instanceId
     this.stopList.taskId = obj.taskId
-    this.stopList.userSid = obj.userSid // window.sessionStorage.getItem('userSid')
+    this.stopList.userSid = window.sessionStorage.getItem('userSid')
     // 办理状态
     this.transactState = obj.transactState
     // 加载流程图相关的数据

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue

@@ -34,23 +34,23 @@
             </el-select>
           </el-col>
           <el-col :span="3">
-            <span>目标存放地点</span>
+            <span>车架号</span>
           </el-col>
           <el-col :span="9">
-            <el-select v-model="temp.targetLocation" placeholder="请选择" clearable class="addinputw"
+            <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
-                       @change="targetLocationChange">
+              <el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>
-              <el-option v-for="item in warehouwarehouse_list" :key="item.dictKey" :label="item.dictValue"
-                         :value="item.dictValue"/>
             </el-select>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>车架号</span>
+            <span>目标存放地点</span>
           </el-col>
           <el-col :span="21">
-            <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
+            <el-select v-model="temp.targetLocation" placeholder="请选择" clearable class="addinputw"
-              <el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>
+                       @change="targetLocationChange">
+              <el-option v-for="item in warehouwarehouse_list" :key="item.dictKey" :label="item.dictValue"
+                         :value="item.dictValue"/>
             </el-select>
           </el-col>
         </el-row>

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue

@@ -31,21 +31,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>目标存放地点</span>
+            <span>车架号</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ temp.targetLocation }}</span>
+              <span>{{ temp.vinNo }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>车架号</span>
+            <span>目标存放地点</span>
           </el-col>
           <el-col :span="21">
             <el-form-item>
-              <span>{{ temp.vinNo }}</span>
+              <span>{{ temp.targetLocation }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -190,7 +190,7 @@ export default {
     this.revokeList.instanceId = obj.instanceId
     this.revokeList.taskId = obj.taskId
     this.revokeList.taskDefKey = obj.taskDefKey
-    this.revokeList.userSid = obj.userSid // window.sessionStorage.getItem('userSid')
+    this.revokeList.userSid = window.sessionStorage.getItem('userSid')
     // 办理状态
     this.transactState = obj.transactState
     // 加载流程图相关的数据

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

@@ -263,7 +263,7 @@
         } else if (index == '8') {
           let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank')
         } else if (index == '1') {
-          let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank')
+          let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank')
         } else if (index == '4') {
           let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank')
         } else if (index == '5') {

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

@@ -268,7 +268,6 @@
           taskName: row.taskName,
           deployId: row.deployId,
           transactState: '01', // 已办任务状态
-          userSid:this.loginInfo.sid, // 登录人sid
         }
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {

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

@@ -324,8 +324,6 @@ export default {
           deployId: row.deployId,
           taskDefKey: row.taskDefKey,
           transactState: '00', // 待办任务状态
-          userSid: this.loginInfo.sid,
-          orgSidPath: this.loginInfo.orgSidPath
         }
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {