Merge remote-tracking branch 'origin/master'

supervise-crm-ui/src/api/project/project.js

@@ -105,8 +105,8 @@ export default {
   },
   selectStoreHouseSid: function(sid) {
     return request({
-      url: '/crm/v1/projectinformation/selectStoreHouse/'+ sid,
-      method: 'get'
+      url: '/crm/v1/storehouseproject/selectStoreBySid/'+ sid,
+      method: 'post'
     })
   },
 

supervise-crm-ui/src/views/project/projectAdd.vue

@@ -541,18 +541,28 @@
       },
       delSid(delSid){
         let newVarImg=[]
+        let newImgss=[]
         this.ImgSid.forEach(function check(value) {
-         if(value.sid != delSid.sid) {
+         if(value.shSid != delSid.shSid ) {
            newVarImg.push(value);
          }
+         if(value.sid != delSid.sid){
+           newImgss.push(value);
+         }
         })
-        this.ImgSid=newVarImg
-        console.log(this.ImgSid);
+        let newImg=newVarImg.concat(newImgss);
+        this.ImgSid=[...new Set(newImg)];
         var ARRSid=[]
+        var aRRsid=[]
         if(this.ImgSid.length>0){
           for(var i=0;i<this.ImgSid.length;i++){
-          ARRSid.push(this.ImgSid[i].sid)
-          this.formobj.storeHouseProjectDto.shSids=ARRSid
+            if(this.ImgSid[i].simpleName){
+              aRRsid.push(this.ImgSid[i].sid)
+            }else{
+              ARRSid.push(this.ImgSid[i].shSid)
+            }   
+          let newSid=ARRSid.concat(aRRsid);
+          this.formobj.storeHouseProjectDto.shSids=[...new Set(newSid)];
          }
         }else{
           this.formobj.storeHouseProjectDto.shSids=[]
@@ -636,7 +646,7 @@
         if (res.success) {
           this.ImgSid=res.data
           for(let i=0;i<this.ImgSid.length;i++){
-            this.getImgsid.push(this.ImgSid[i].sid)
+            this.getImgsid.push(this.ImgSid[i].shSid)
           }
         }
        })
@@ -649,12 +659,11 @@
       },
       guanlianSid(){
         let val=this.ValSid
-        console.log(val);
         for(let i=0;i<val.length;i++){
          this.ARRSid.push(val[i].sid)
         }
         var oldArr = [...new Set(this.ARRSid)];
-        if(this.ImgSid){
+        if(this.ImgSid.length>0){
           let newArr =this.getImgsid.concat(oldArr);
           let newImg=this.ImgSid.concat(this.ValSid);
           this.ImgSid=[...new Set(newImg)];
@@ -663,6 +672,7 @@
           this.ImgSid=[...new Set(this.ValSid )]
           this.formobj.storeHouseProjectDto.shSids=oldArr
         }
+        console.log(this.ImgSid)
         this.drawer=false
         this.$refs.multipleTable.clearSelection();
       },

supervise-crm-ui/src/views/project/projectInfo.vue

@@ -233,7 +233,7 @@
           this.$emit('doback')
         })
         
-      req.getStorehouseBySid(sid).then((res) => {
+      req.selectStoreHouseSid(sid).then((res) => {
         if (res.success) {
           this.temps=res.data
         }

supervise-crm-ui/src/views/projectStaff/index.vue

@@ -154,8 +154,8 @@
               this.projectList.entryName=res.data[0].entryName
               this.projectList.bankName=res.data[0].bankName
               req.getUserProjectBySid(res.data[0].sid).then(res=>{
-              this.DataLists=res.data.bankUsers
-              this.usersList=res.data.users
+              this.DataLists=res.data.users
+              this.usersList=res.data.bankUsers
               this.estimate()
             })
             }
@@ -191,8 +191,8 @@
             this.projectList.bankName=this.checkList[0].bankName
 
             req.getUserProjectBySid(row.sid).then(res=>{
-              this.DataLists=res.data.bankUsers
-              this.usersList=res.data.users
+              this.DataLists=res.data.Users
+              this.usersList=res.data.bankusers
               this.estimate()
             })
         },
@@ -257,7 +257,7 @@
           const { dataListOne,dataListTwo, DataLists,usersList } = this
           DataLists.forEach(key => {
             dataListOne.forEach(row => {
-              if (row.sid == key.sid) {
+              if (row.sid == key.userSid) {
                 if(row.sid){
                   this.$refs.multipleTable.toggleRowSelection(row, true);
                 }
@@ -266,7 +266,7 @@
           })
           usersList.forEach(key => {
             dataListTwo.forEach(row => {
-              if (row.sid == key.sid) {
+              if (row.sid == key.userSid) {
                 if(row.sid){
                   this.$refs.multipleTables.toggleRowSelection(row, true);
                 }else{

supervise-enterprise-ui/src/views/NewList/needMoney.vue

@@ -112,7 +112,7 @@ export default {
 /deep/ .el-input{
         margin-top: -10px;
       }
-/deep/ .el-input__suffix{
+/deep/ .production .el-input__suffix{
         margin-top: -8px;
       }
   .topHouse h2{

supervise-enterprise-ui/src/views/NewList/returnedMoney.vue

@@ -1,21 +1,58 @@
 <template>
   <div>
-        <button-bar ref="btnbar" view-title="回款上报" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar ref="btnbar" view-title="用款申请提交" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
     <div class="listconadd">
+      <div class="topHouse">
+        <h2>账号回款上报</h2>
+        <div class="warehouse">
+          <div class="top">
+            <span>所在项目{{"\xa0\xa0\xa0"}} XXX</span>
+            <span>申请日期：XXXXX</span>
+          </div>
+          <div style="margin-top: 25px;">
+            仓库名称{{"\xa0\xa0\xa0"}} <el-select v-model="storehouseId" placeholder="请选择" size="small"   style="width: 60%;"  >
+               <el-option
+                 v-for="(storehouse,i) in storehouseList"
+                 :key="i"
+                 :label="storehouse.title"
+                 :value="storehouse.mun">
+               </el-option> 
+             </el-select>
+          </div>
+          <div style="margin-top: 25px;">
+            <span>账户详情{{"\xa0\xa0\xa0"}}</span> 
+            <ul class="userName">
+              <li>开户行：XXX</li>
+              <li>账号：XXX</li>
+              <li>账户名称：XXXX</li>
+            </ul>
+          </div>
+          <div style="margin-top: 25px;">
+            <span>统计日期{{"\xa0\xa0\xa0"}}</span> 
 
           </div>
+          <div style="margin-top: 45px;margin-left: -10px;font-size: 14px;">
+            注:客户发起发起申请，首先监管审核，再银行审核通过后，客户在审核结果表里打印纸质申请表盖章并提交给监管、银行各一份。
+          </div>
+          <el-button type="primary" style="width: 13%;margin-left: 60%;margin-top: 50px;" size="small"  @click="getPurchaseList">提交审核</el-button>
+        </div>
       </div>
-  </template>
+    </div>
+  </div>
+</template>
 
-  <script>
-  import ButtonBar from '@/components/ButtonBar'
-  export default {
+<script>
+import ButtonBar from '@/components/ButtonBar'
+export default {
   components: {
     ButtonBar
   },
   data() {
     return {
       btndisabled: false,
+      storehouseId:'',
+      estimateCalculatedValue:'',
+      storehouseList:[{mun:'1',title:'喜相随仓库'},{mun:'2',title:'大四喜仓库'}],
       queryInfos: {
         total: 0,
         current: 1,
@@ -48,15 +85,47 @@
                     break
             }
         },
+    getPurchaseList(){
+
+    },
     doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
     },
   },
-  };
-  </script>
-  
-  <style lang="scss" scoped>
-
-  </style>
+};
+</script>
 
+<style lang="scss" scoped>
+.listconadd{
+  .topHouse{
+    h2{
+      text-align: center;
+      font-weight: 520;
+      font-size: 26px;
+    }
+   .warehouse{
+    margin: 0 auto;
+    width: 65%;
+    height: 400px;
+    font-size: 18px;
+     .top{
+      width: 100%;
+      height: 40px;
+      border-bottom: 1px solid #717171;
+      display: flex;
+      justify-content: space-between;
+     }
+     .userName{
+      margin-top: -30px;
+      margin-left: 42px;
+      list-style-type:none;
+      li{
+        margin: 10px;
+        font-size: 16px;
+      }
+     }
+    }
+  }
+}
+</style>

warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue

@@ -446,6 +446,9 @@ export default {
       }
     },
     async addStorehouse() {
+      if (this.form.name == "") {
+        this.$message.error('请至少填写仓库名称')
+      }else{
         const { data: result } = await this.$http.post(
         "/v1/shstorehouse/save",
         this.form
@@ -453,6 +456,7 @@ export default {
       if (result.code == 200) this.$message.success("成功添加仓库");
       this.handleReturn('true')
       this.claerArrList()
+      }
     },
     async updataStorehouse() {
       const { data: result } = await this.$http.post(

warehousing-system/project_web_ui/src/views/component/initial_value/location.vue

@@ -170,14 +170,6 @@ export default {
 			this.queryInfo.query = ''
 			this.dosearch()
 		},
-    handleSizeChange (val) {
-      this.queryInfo.pageSize = val
-      this.getLocationList()
-    },
-    handleCurrentChange (val) {
-      this.queryInfo.pageNum = val
-      this.getLocationList()
-    },
     async getLocationList () {
       const { data: result } = await this.$http.get('/location/list', { params: this.queryInfo })
       if (result.status !== 200) return this.$message.error('获取列表失败')

warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue

@@ -175,7 +175,7 @@
                     <el-input v-model="scope.row.locationNumber" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="120">
+                <el-table-column label="操作" align="center" width="120">
                   <template slot-scope="scope">
                     <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
                   </template>

warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue

@@ -91,6 +91,7 @@ export default {
         createPerson: "",
         checkPerson: "",
         status: "",
+        locationName:''
       },
       queryInfos: {
         total: 0,

warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue

@@ -142,7 +142,7 @@
                     <el-input v-model="scope.row.estimateConfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="出库价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
+                <el-table-column label="出库价值(元)" width="150" prop="estimateCalculatedValue" align="center">
                   <template slot-scope="scope">
                     <el-input v-model="scope.row.estimateCalculatedValue"  :readonly="true"   placeholder="" clearable></el-input>
                   </template>
@@ -152,7 +152,7 @@
                     <el-input v-model="scope.row.realityCalculatedValue" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="货位号" width="150" prop="locationNumber" align="center">
+                <el-table-column label="货位号" prop="locationNumber" align="center">
 <!--                  <template slot-scope="scope">
                     <el-input v-model="scope.row.locationNumber" placeholder="" clearable></el-input>
                   </template>-->
@@ -175,7 +175,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" fixed="right" align="center" width="150">
+                <el-table-column label="操作" align="center" width="150">
                   <template slot-scope="scope">
                     <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
                   </template>

warehousing-system/project_web_ui/src/views/component/pictureList/pictureParticulars.vue

@@ -41,7 +41,7 @@
                   </div>
                   <div>
                     <div style="color: #ff2b00;font-size: 24px;">{{ temp.monthlyPrice }}<span v-if="temp.monthlyPrice">元/月</span> </div>
-                    <span class="fontSize">用租金</span>
+                    <span class="fontSize">月租金</span>
                   </div>
                 </div>
                 <div class="addres">区{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}域：<span>{{ temp.cityName }}-{{ temp.countyName }}</span></div>
@@ -68,7 +68,7 @@
             <div class="basicsImg">
               <div class="basicsTop">
                 <div class="span"/>
-                <h1>描{{"\xa0\xa0\xa0"}}述</h1>
+                <h1>仓库详细图片</h1>
               </div>
               <ul>
                 <li v-for="(item,i) in temp.pics" :key="i">
@@ -128,7 +128,7 @@
       },
       clickMapInfo(jd,wd) {
 				if (!jd) {
-					this.$message.error("请维护地址信息");
+					this.$message.error("请输入经纬度信息");
 					return;
 				}
 				this.mapInfo = jd + "," + wd;