From 1431d20b28dc0a4c70e16c3ab4a19265a9795111 Mon Sep 17 00:00:00 2001
From: yxt_djz <313618925@qq.com>
Date: Mon, 25 Jul 2022 18:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=87=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseOutsourcingApplicationMapper.xml          |  2 +-
 .../baseoutsourcingapplication.vue                |  2 +-
 .../baseoutsourcingapplicationAdd.vue             | 15 +++++++++++++--
 .../baseoutsourcingapplicationInfo.vue            |  4 +++-
 .../workflow/baseoutsourcingapplication.vue       |  3 +++
 .../workflow/baseoutsourcingapplicationAdd.vue    |  3 +++
 .../workflow/baseoutsourcingapplicationInfo.vue   |  5 ++++-
 .../ruzhangguanli/ruzhangInfo.vue                 |  5 +++--
 8 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
index bb5b331ca6..e9f588c9d5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
@@ -4,7 +4,7 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationVo">
-		SELECT * FROM base_outsourcing_application <where> ${ew.sqlSegment} </where>
+		SELECT * FROM base_outsourcing_application <where> ${ew.sqlSegment} </where> order by createTime desc
 	</select>
 
 	<select id="BaseOutsourcingApplicationDetailsVo"
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
index ab60170286..6eac57d3b8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
@@ -48,7 +48,6 @@
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="applicationCode" width="140px;" label="申请单编号" align="center"/>
             <el-table-column prop="nodeState" width="100px;" label="状态" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
@@ -56,6 +55,7 @@
                       style="color: #018ad2;cursor: pointer;">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
+            <el-table-column prop="applicationCode" width="140px;" label="申请编号" align="center"/>
             <el-table-column prop="applicationDate" width="110px;" label="申请日期" align="center"/>
             <el-table-column prop="modelName" label="车型" align="center"/>
             <el-table-column prop="num" width="60px;" label="台数" align="center"/>
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
index aac0f8b2e6..4c06a4e918 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -19,6 +19,7 @@
       <div class="listconadd">
         <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
           <div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
+          <div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
           <br><br>
           <el-row style="border-left: none;">
             <el-col :span="3" class="tleftb">
@@ -88,7 +89,7 @@
               <span><span class="icon">*</span>销售指导价</span>
             </el-col>
             <el-col :span="9" class="trightb">
-              <el-form-item v-show="formobj.externalMiningTypeKey==1" prop="guidedPrice"><el-input size="small" v-model="formobj.guidedPrice" placeholder="销售指导价" class="addinputw" clearable /></el-form-item>
+              <el-form-item v-show="formobj.externalMiningTypeKey==1" prop="guidedPrice">{{formobj.guidedPrice}}</el-form-item>
               <el-form-item v-show="formobj.externalMiningTypeKey==2" prop="guidedPrice">{{formobj.guidedPrice}}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -163,7 +164,7 @@
           </el-row>
           <el-row style="border-left: none;">
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>备注</span>
+              <span>备注</span>
             </el-col>
             <el-col :span="21" class="trightb">
               <el-form-item prop="remarks"><el-input size="small" v-model="formobj.remarks" placeholder="备注" class="addinputw" clearable /></el-form-item>
@@ -482,7 +483,17 @@ export default {
     },
 
     showAdd() {
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      this.formobj.applicationDate = dayDate
       this.formobj.contract={}
+      this.formobj.depositBankName=""
+      this.formobj.bankAccount=""
       this.fileList=[]
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
index fed20441b8..197874251e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
@@ -10,8 +10,10 @@
 		</div>
 		<!-- 标题按钮部分结束 -->
 		<div class="listconadd">
-      <div class="titwu">外采申请表</div>
       <el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
+        <div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
+        <div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
+        <br><br>
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="3" class="tleftb">分公司名称</el-col>
           <el-col :span="5" class="trightb">
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
index 5fb0e19720..d379ab097e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
@@ -15,6 +15,9 @@
 		<!-- 标题按钮部分结束 -->
 		<div>
 			<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd" >
+        <div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
+        <div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
+        <br><br>
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="3" class="tleftb">分公司名称</el-col>
           <el-col :span="5" class="trightb">
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
index 87d6e5d980..9c61c3c871 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
@@ -18,6 +18,9 @@
 		<!-- Start 新增修改部分 -->
 		<div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
+        <div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
+        <div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
+        <br><br>
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>分公司名称</span>
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
index b2d2bc1f0c..8de6a92323 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
@@ -12,6 +12,9 @@
 		<!-- 标题按钮部分结束 -->
 		<div >
 			<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
+        <div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
+        <div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
+        <br><br>
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="3" class="tleftb">分公司名称</el-col>
           <el-col :span="5" class="trightb">
@@ -103,7 +106,7 @@
         </el-row>
         <el-row  >
           <el-col :span="3" class="tleftb">
-            <span><span class="icon">*</span>备注</span>
+            <span>备注</span>
           </el-col>
           <el-col :span="21" class="trightb">
             <el-form-item prop="remarks">
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
index e44da051e0..acc17ebcf5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
@@ -147,7 +147,8 @@ export default {
         purchaseOrderNo: '',
         remarks: '', // 备注
         vehicleOrderSid: '',
-        vehicleList: []
+        vehicleList: [],
+        comment:''
       },
       dialogList: {
         comment: ''
@@ -277,7 +278,7 @@ export default {
     },
     // 同意
     openAgree() {
-      this.formobj.comment='同意'
+      this.formobj.comment = '同意'
       // 查验下一环节要用到，流程定义的id
       req.getNextNodesForSubmit(this.formobj).then(resp => {
         if (resp.success) {