Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@@ -102,13 +102,9 @@
           </el-row>
           <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
             <div>资方结清费用</div>
-            <div>
-              <div>
-                <span>贷款保证金:</span>
-                <el-input v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
-              </div>
-              <div>
-                <span>是否抵顶:</span>
+            <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+              <div>贷款保证金:<el-input style="width: 60%" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
+              <div>是否抵顶:
                 <el-radio-group v-model="formobj.loanSettleBankCostVo.topping ">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
@@ -522,6 +518,11 @@ export default {
       req.settleRepoInit({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
+            if (res.success) {
+              this.bank_list = res.data
+            }
+          })
           if (this.formobj.loanSettleBankCostVo.filesList.length > 0) {
             const aa = []
             this.formobj.loanSettleBankCostVo.filesList.forEach((e) => {
@@ -714,4 +715,13 @@ export default {
 .addinputInfo {
   margin-left: 190px !important;
 }
+/* 覆盖element-ui的单选按钮样式 */
+.el-radio__input.is-checked .el-radio__inner {
+  border-color: #409EFF; /* 未选中状态下的边框颜色 */
+  background-color: #409EFF; /* 选中后的背景色 */
+}
+/* 如果需要改变选中后对勾的颜色 */
+.el-radio__input.is-checked .el-radio__inner::after {
+  background-color: #fff; /* 对勾的颜色 */
+}
 </style>

anrui-riskcenter-ui/src/views/settlethevehicleaccount/settlethevehicleaccount.vue

@@ -56,7 +56,6 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="130" />
             <el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
             <el-table-column prop="loanName" label="贷款人" align="center" width="130" />
-            <el-table-column prop="peroid" label="期数" align="center" width="130" />
             <el-table-column prop="settingDate" label="结清日期" align="center" width="130" />
             <el-table-column prop="bankSettlePrice" label="资方结清金额" align="center" width="130" />
             <el-table-column prop="settleAll" label="公司正常结清合计" align="center" width="140" />

yxt-as-ui/src/api/storage/manufacturerconfirm.js

@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/as/v1/asoldpartreturnapply/confirmListPage',
+      url: '/as/v1/asoldpartreturnconfirm/listPage',
       method: 'post',
       data: params,
       headers: {
@@ -14,54 +14,18 @@ export default {
     })
   },
 
-  // 获取确认结果详情
-  saveConfirmResult: function(data) {
-    return request({
-      url: '  ',
-      method: 'post',
-      data: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    });
-  },
-
-
-  // 获取确认结果详情
-  fetchDetailsByMainSid: function(data) {
-    return request({
-      url: '/as/v1/asoldpartreturnconfirm/fetchDetailsByMainSid/' + data,
-      method: 'get'
-    });
-  },
-
-
-
   // 初始化
   init: function(data) {
     return request({
-      url: '/as/v1/asoldpartreturnapply/fetchDetailsBySid/' + data,
+      url: '/as/v1/asoldpartreturnconfirm/fetchDetailsBySid/' + data,
       method: 'get'
     });
   },
 
-
   // 新增、保存
   save: function(data) {
     return request({
-      url: '/as/v1/asoldpartreturnapply/save',
-      method: 'post',
-      data: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    });
-  },
-
-  // 提交
-  submit: function(data) {
-    return request({
-      url: '/as/v1/asoldpartreturnapply/submit',
+      url: '/as/v1/asoldpartreturnconfirm/confirm',
       method: 'post',
       data: data,
       headers: {
@@ -70,40 +34,4 @@ export default {
     });
   },
 
-
-  deleteBySids: function(data) {
-    return request({
-      url: '/as/v1/asoldpartreturnapply/delBySids',
-      method: 'DELETE',
-      data: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
-  // 查询分页列表
-  getGoodsListPage: function(params) {
-    return request({
-      url: '/wms/apiadmin/WmsOutBill/getInventoryList',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
-  // 下载模板
-  downloadExcel: function() {
-    return request({
-      url: '/as/v1/asoldpartreturnapply/downloadModPriceExcel',
-      method: 'post',
-      responseType: 'blob', // 表明返回服务器返回的数据类型
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
 }

yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue

@@ -3,7 +3,7 @@
 
     <div class="tab-header webtop">
       <!-- 标题 -->
-      <div>{{title}}旧件返厂确认</div>
+      <div>{{title}}厂家确认</div>
       <!-- start 添加修改按钮 -->
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
@@ -15,7 +15,7 @@
 
     <div class="listconadd">
 
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <!-- <div class="title">
           <div>基础信息</div>
         </div> -->
@@ -41,14 +41,14 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="span-sty">附件</div>
-            <el-form-item class="trightb_item">
-              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
-              </el-image>
+            <div class="span-sty"><span class="must">*</span> 附件</div>
+            <el-form-item prop="imgList">
+              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
+                :upload-data="{ type: '0001' }" @change="backData" />
             </el-form-item>
           </el-col>
 
+
         </el-row>
 
         <el-row>
@@ -65,10 +65,10 @@
           style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
           <div>已返厂旧件列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
+          style="width: 100%;" :row-style="{height: '40px'}">
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column label="商品名称" prop="goodsSkuName" align="center" />
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="厂家" prop="manufacturerName" align="center" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
@@ -97,15 +97,25 @@
 
 <script>
   import req from '@/api/storage/manufacturerconfirm.js'
-
+  import uploadImg from '@/components/uploadFile/uploadImg'
   export default {
-    components: {},
+    components: {
+      uploadImg
+    },
     data() {
       return {
         listLoading: false,
         submitdisabled: false,
         title: "新增",
         formobj: {},
+        imgList: [],
+        rules: {
+          filePaths: [{
+            required: true,
+            message: '附件不能为空',
+            trigger: 'blur'
+          }],
+        }
       }
     },
     methods: {
@@ -119,10 +129,18 @@
       },
 
       showAdd(sid) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
         req.init(sid)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data
+              for (var i = 0; i < resp.data.filePaths.length; i++) {
+                this.imgList.push({
+                  url: resp.data.filePaths[i].url
+                })
+              }
             }
           })
           .catch(e => {
@@ -130,7 +148,9 @@
           })
       },
       showEdit(row) {
-
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
         var params = {
           sid: row.sid
         }
@@ -143,6 +163,17 @@
           .catch(e => {
             this.formobj = {}
           })
+      },
+      backData(value) {
+        console.log('backData》》》》', value)
+        console.log('imgList', this.imgList)
+        this.imgList = value
+
+        for (var i = 0; i < this.imgList.length; i++) {
+          this.formobj.filePaths.push(this.imgList[i].url)
+        }
+
+
       },
       commodityComputeYHAndXSJE(row) {
 
@@ -153,11 +184,39 @@
       },
       saveOrUpdate() {
 
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.save(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+
       },
     }
   }
 </script>
 <style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
   .span-sty {
     width: 130px !important;
   }

yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue

@@ -3,7 +3,7 @@
 
     <div class="tab-header webtop">
       <!-- 标题 -->
-      <div>旧件返厂</div>
+      <div>厂家确认</div>
       <!-- start 添加修改按钮 -->
       <div>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@@ -55,14 +55,7 @@
           </el-col>
 
         </el-row> -->
-        <el-row>
-
-          <el-col :span="24">
-            <div class="span-sty">备注</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
 
-        </el-row>
 
         <el-row>
           <el-col :span="24">
@@ -74,16 +67,24 @@
             </el-form-item>
           </el-col>
 
+        </el-row>
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+
         </el-row>
 
         <div class="title"
           style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
           <div>已返厂旧件列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
+          style="width: 100%;" :row-style="{height: '40px'}">
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column label="商品名称" prop="goodsSkuName" align="center" />
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="厂家" prop="manufacturerName" align="center" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />

yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue

@@ -3,7 +3,7 @@
 
     <div class="tab-header webtop">
       <!-- 标题 -->
-      <div>旧件返厂</div>
+      <div>厂家确认</div>
       <!-- start 添加修改按钮 -->
       <div>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@@ -83,7 +83,7 @@
         <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
           :row-style="{height: '40px'}">
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column label="商品名称" prop="goodsSkuName" align="center" />
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="厂家" prop="manufacturerName" align="center" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />

yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue

@@ -8,7 +8,8 @@
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="importDetail">导入厂家返件明细</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="downLoadDetail">下载待出库旧件明细</el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" v-show="formobj.sid!=''"
+          @click="downLoadDetail">下载待出库旧件明细</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
       <!-- end 添加修改按钮 -->
@@ -59,14 +60,14 @@
           </el-col>
 
         </el-row> -->
+
         <el-row>
 
           <el-col :span="24">
-            <div class="span-sty">备注</div>
-            <el-form-item>
-              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea"
-                :rows="4" clearable />
-
+            <div class="span-sty"><span class="must">*</span> 附件</div>
+            <el-form-item prop="imgList">
+              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
+                :upload-data="{ type: '0001' }" @change="backData" />
             </el-form-item>
           </el-col>
 
@@ -75,14 +76,16 @@
         <el-row>
 
           <el-col :span="24">
-            <div class="span-sty"><span class="must">*</span> 附件</div>
-            <el-form-item prop="imgList">
-              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
-                :upload-data="{ type: '0001' }" @change="backData" />
+            <div class="span-sty">备注</div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea"
+                :rows="4" clearable />
+
             </el-form-item>
           </el-col>
 
         </el-row>
+
         <div class="title  titleOne">
           <div>返厂旧件列表</div>
           <el-button type="primary" size="mini" @click="seleGoods3()">添加</el-button>
@@ -202,7 +205,7 @@
         <div class="tit" />
         <!--  翻页  -->
         <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-          :limit.sync="queryParams.size" class="pagination" @pagination="importDetail" />
+          :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods" />
 
       </div>
 
@@ -241,7 +244,7 @@
         <div class="tit" />
         <!--  翻页  -->
         <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-          :limit.sync="queryParams.size" class="pagination" @pagination="importDetail" />
+          :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods3" />
 
       </div>
 
@@ -566,17 +569,13 @@
       },
       seleGoods(row) {
         this.itemInfo = row
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "vinNo": row.vinNo,
-            "goodsSkuCode": row.goodsSkuCode,
-            "sourceBillNo": row.sourceBillNo,
-            "orgPath": window.sessionStorage.getItem('defaultOrgPath'),
-          }
+        this.queryParams.params = {
+          "vinNo": row.vinNo,
+          "goodsSkuCode": row.goodsSkuCode,
+          "sourceBillNo": row.sourceBillNo,
+          "orgPath": window.sessionStorage.getItem('defaultOrgPath'),
         }
+
         req.getGoodsListPage(this.queryParams).then(resp => {
             if (resp.success) {
               const data = resp.data
@@ -630,17 +629,12 @@
       handleClose2() {
         this.dialogVisible2 = false
       },
-      seleGoods3(row) {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "vinNo": '',
-            "goodsSkuCode": '',
-            "sourceBillNo": '',
-            "orgPath": window.sessionStorage.getItem('defaultOrgPath'),
-          }
+      seleGoods3() {
+        this.queryParams.params = {
+          "vinNo": '',
+          "goodsSkuCode": '',
+          "sourceBillNo": '',
+          "orgPath": window.sessionStorage.getItem('defaultOrgPath'),
         }
         req.getGoodsListPage(this.queryParams).then(resp => {
             if (resp.success) {

yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue

@@ -55,14 +55,7 @@
           </el-col>
 
         </el-row> -->
-        <el-row>
-
-          <el-col :span="24">
-            <div class="span-sty">备注</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
 
-        </el-row>
 
         <el-row>
           <el-col :span="24">
@@ -76,6 +69,15 @@
 
         </el-row>
 
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+
+        </el-row>
+
         <div class="title"
           style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
           <div>商品列表</div>