调车、调账、存放地点

anrui-scm/anrui-scm-ui/src/api/supplychain/diaochekaipiaoshenqing.js

@@ -59,6 +59,17 @@ export function selByLinkSid(data) {
   })
 }
 
+// 删除附件
+export function deleteFilesOss(data) {
+  return request({
+    url: '/base/v1/commonappendix/deleteFilesOss',
+    method: 'post',
+    params: {
+      fullPath: data
+    }
+  })
+}
+
 // 提交
 export function submitSunInv(data) {
   return request({

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

@@ -56,14 +56,14 @@
                 <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column width="120px" prop="state" label="状态" header-align="center" align="left"/>
+            <el-table-column width="180px" prop="state" label="状态" header-align="center" align="left"/>
             <el-table-column width="220px" prop="applyId" label="申请编号" align="center"/>
             <el-table-column width="140px" prop="applyDate" label="申请日期" align="center"/>
             <el-table-column width="130px" prop="applyName" label="申请人" align="center"/>
             <el-table-column width="180px" prop="vin" label="车架号" align="center"/>
             <el-table-column width="160px" prop="location" label="现存放地点" align="center"/>
             <el-table-column width="160px" prop="targetLocation" label="目标存放地点" align="center"/>
-            <el-table-column width="130px" prop="operator" label="移库操作人" align="center"/>
+            <el-table-column width="130px" prop="operator" label="经办人" align="center"/>
             <el-table-column width="160px" prop="applyPrice" label="申请费用" align="center"/>
             <el-table-column width="180px" label="现场照片" align="center">
               <template slot-scope="{row}"> <!-- row.state == '已办结' -->

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

@@ -55,20 +55,12 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="3">
-            <span>移库原因</span>
-          </el-col>
-          <el-col :span="21">
-            <el-input v-model="temp.changeReason" maxlength="125" placeholder="" class="addinputw" clearable/>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="3">
             <span><span class="icon">*</span>车架号</span>
           </el-col>
           <el-col :span="21">
-            <el-form-item prop="vinNo">
+            <el-form-item>
               <span>{{ temp.vinNo }}</span>
               <el-button size="small" type="primary" @click="selectVinNo" class="selectVinNoBtn">选择</el-button>
               <!--              <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">-->
@@ -79,24 +71,30 @@
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>申请费用</span>
+            <span>变更原因</span>
           </el-col>
           <el-col :span="21">
-            <el-input v-model="temp.applicantFunds" maxlength="125" placeholder="" class="addinputw" clearable
-                      @keyup.native="temp.applicantFunds = oninput(temp.applicantFunds,2)"/>
+            <el-input v-model="temp.changeReason" maxlength="125" placeholder="" class="addinputw" clearable/>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3"> <!--<span class="icon">*</span>-->
-            <span>移库操作人</span>
+          <el-col :span="3">
+            <span><span class="icon">*</span>经办人</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="operator">
-              <el-input v-model="temp.operator" maxlength="125" placeholder="" class="addinputw" clearable/>
-            </el-form-item>
+            <el-input v-model="temp.operator" maxlength="125" placeholder="" class="addinputw" clearable/>
           </el-col>
           <el-col :span="3">
-            <span>保险状态</span>
+            <span>申请费用(元)</span>
+          </el-col>
+          <el-col :span="9">
+            <el-input v-model="temp.applicantFunds" maxlength="125" placeholder="" class="addinputw" clearable
+                      @keyup.native="temp.applicantFunds = oninput(temp.applicantFunds,2)"/>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <span><span class="icon">*</span>保险状态</span>
           </el-col>
           <el-col :span="9">
             <el-form-item prop="InsuranceStateKey">
@@ -104,6 +102,12 @@
               <el-radio v-model="temp.InsuranceStateKey" label="1">是</el-radio>
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <span>临牌</span>
+          </el-col>
+          <el-col :span="9">
+            <el-input v-model="temp.temporaryCard" maxlength="125" placeholder="" class="addinputw" clearable/>
+          </el-col>
         </el-row>
         <el-row v-show="temp.InsuranceStateKey == '1'">
           <el-col :span="3">
@@ -114,12 +118,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
-            <span>临牌</span>
-          </el-col>
-          <el-col :span="21">
-            <el-input v-model="temp.temporaryCard" maxlength="125" placeholder="" class="addinputw" clearable/>
-          </el-col>
+
         </el-row>
       </el-form>
     </div>
@@ -241,7 +240,7 @@ export default {
         }
       },
       rules: {
-        vinNo: [{ required: true, message: '车架号不能为空', trigger: 'change' }],
+        // vinNo: [{ required: true, message: '车架号不能为空', trigger: 'change' }],
         operator: [{ required: true, message: '经办人不能为空', trigger: 'change' }],
         InsuranceStateKey: [{ required: true, message: '保险状态不能为空', trigger: 'blur' }],
         location: [{ required: true, message: '现存放地点不能为空', trigger: 'change' }],
@@ -480,6 +479,17 @@ export default {
     },
     // 提交添加数据
     handleCreate() {
+      if (this.temp.vinNo == ''){
+        this.$message({
+          showClose: true,
+          message: '车架号不能为空！',
+          type: 'error'
+        })
+        return
+      }
+      if (this.temp.applicantFunds == ''){
+        this.temp.applicantFunds = '0'
+      }
       if (this.temp.InsuranceStateKey == '0') {
         this.temp.InsuranceState = '否'
         this.temp.policyImage = []
@@ -511,6 +521,17 @@ export default {
     },
     handleSubmit() {
       const _this = this
+      if (this.temp.vinNo == ''){
+        this.$message({
+          showClose: true,
+          message: '车架号不能为空！',
+          type: 'error'
+        })
+        return
+      }
+      if (this.temp.applicantFunds == ''){
+        this.temp.applicantFunds = '0'
+      }
       if (this.temp.InsuranceStateKey == '0') {
         this.temp.InsuranceState = '否'
         this.temp.policyImage = []
@@ -551,19 +572,10 @@ export default {
   width: 80%;
 }
 
-.listconadd {
-  width: 100%;
-  padding: 0 240px !important;
-}
-
 .title {
   padding-top: 28px;
 }
 
-.formadd .title {
-  padding: 10px !important;
-}
-
 .yancheAdd .el-row {
   border: 0 !important;
 }

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

@@ -7,7 +7,7 @@
       </div>
     </div>
     <div class="listconadd">
-      <div class="title">车辆存放地点变更申请</div>
+      <div class="titwu">车辆存放地点变更申请</div>
       <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
         <el-row style="border-top: 1px solid #e0e3eb;">
           <el-col :span="3">
@@ -47,29 +47,37 @@
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>移库原因</span>
+            <span>车架号</span>
           </el-col>
           <el-col :span="21">
             <el-form-item>
-              <span>{{ temp.changeReason }}</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.changeReason }}</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-col :span="9">
+            <el-form-item>
+              <span>{{ temp.operator }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <span>申请费用(元)</span>
+          </el-col>
+          <el-col :span="9">
             <el-form-item>
               <span>{{ temp.applicantFunds }}</span>
             </el-form-item>
@@ -77,19 +85,21 @@
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>移库操作人</span>
+            <span>保险状态</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ temp.operator }}</span>
+              <span>{{ temp.insuranceState }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>保险状态</span>
+            <span>临牌</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ temp.insuranceState }}</span>
+              <el-form-item>
+                <span>{{ temp.temporaryCard }}</span>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -103,18 +113,6 @@
                  :src="item" @click="open(temp.policyImage)">
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="3">
-            <span>临牌</span>
-          </el-col>
-          <el-col :span="21">
-            <el-form-item>
-              <el-form-item>
-                <span>{{ temp.temporaryCard }}</span>
-              </el-form-item>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
     </div>
     <el-dialog :visible.sync="dialogVisible" width="1000px"
@@ -191,19 +189,6 @@ export default {
   width: 80%;
 }
 
-.listconadd {
-  width: 100%;
-  padding: 0 240px !important;
-}
-
-.title {
-  padding-top: 28px;
-}
-
-.formadd .title {
-  padding: 10px !important;
-}
-
 .yancheAdd .el-row {
   border: 0 !important;
 }

anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue

@@ -145,13 +145,18 @@
     </div>
     <!-- 照片弹窗 -->
     <el-dialog title="开票信息图片" :visible.sync="dialogVisible">
-      <el-image
-        v-for="(item,index) in dialogUrl"
-        :key="index"
-        :src="item"
-        style="width: 100px; height: 100px"
-        :preview-src-list="dialogUrl">
-      </el-image>
+      <div v-for="(item,index) in dialogUrl" style="display:inline-block;">
+        <div class="dialogImg">
+          <el-image
+            :key="index"
+            :src="item"
+            style="width: 100px; height: 100px"
+            :preview-src-list="dialogUrl">
+          </el-image>
+          <el-button type="danger" size="mini" @click="handleDel(item)">删除</el-button>
+        </div>
+
+      </div>
     </el-dialog>
     <diaochecheliang-list ref="xuanChe" v-show="isXuanche === true" @handleVehicle="selectVehicle"
                           @doback="resetState"/>
@@ -162,8 +167,9 @@
 import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
 import upload_diaoche from '@/components/uploadFile/upload_diaoche'
 import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
-import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
+import { fetchDetailsBySid, save, selByLinkSid, submitSunInv, deleteFilesOss } from '@/api/supplychain/diaochekaipiaoshenqing.js'
 import { typeValues } from '@/api/supplychain/yancheguanli'
+import req from '@/api/kucunguanli/changjiachuku'
 
 export default {
   name: 'diaocheshenqingAdd',
@@ -289,6 +295,18 @@ export default {
       })
       this.dialogVisible = true
     },
+    handleDel(val) {
+      req.deleteFilesOss(val).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, type: 'success', message: '删除成功！' })
+          this.dialogUrl.forEach((item, index) => {
+            if (item === val) {
+              this.dialogUrl.splice(index, 1)
+            }
+          })
+        }
+      })
+    },
     // 明细表添加一行数据
     handlediaocheliang() {
       if (this.temp.callOutOrgSid == '') {
@@ -505,4 +523,10 @@ export default {
   display: inline-block;
   padding-right: 10px;
 }
+.dialogImg{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
 </style>

anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue

@@ -103,13 +103,13 @@
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center" width="140">
-                  <template slot-scope="scope">
-                    <!--                    <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"-->
-                    <!--                              :readonly="vehicleList[scope.$index].inboundDate"/>-->
-                    <span>{{ scope.row.invoiceTypeValue }}</span>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="发票类型" align="center" width="140">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    &lt;!&ndash;                    <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                              :readonly="vehicleList[scope.$index].inboundDate"/>&ndash;&gt;-->
+<!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>

anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue

@@ -70,11 +70,11 @@
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center" width="140">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.invoiceTypeValue }}</span>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="发票类型" align="center" width="140">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>

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

@@ -50,29 +50,37 @@
           </el-row>
           <el-row>
             <el-col :span="3">
-              <span>移库原因</span>
+              <span>车架号</span>
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                <span>{{ temp.changeReason }}</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.changeReason }}</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-col :span="9">
+              <el-form-item>
+                <span>{{ temp.operator }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <span>申请费用(元)</span>
+            </el-col>
+            <el-col :span="9">
               <el-form-item>
                 <span>{{ temp.applicantFunds }}</span>
               </el-form-item>
@@ -80,19 +88,21 @@
           </el-row>
           <el-row>
             <el-col :span="3">
-              <span>移库操作人</span>
+              <span>保险状态</span>
             </el-col>
             <el-col :span="9">
               <el-form-item>
-                <span>{{ temp.operator }}</span>
+                <span>{{ temp.insuranceState }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <span>保险状态</span>
+              <span>临牌</span>
             </el-col>
             <el-col :span="9">
               <el-form-item>
-                <span>{{ temp.insuranceState }}</span>
+                <el-form-item>
+                  <span>{{ temp.temporaryCard }}</span>
+                </el-form-item>
               </el-form-item>
             </el-col>
           </el-row>
@@ -106,18 +116,6 @@
                    :src="item" @click="open(temp.policyImage)">
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="3">
-              <span>临牌</span>
-            </el-col>
-            <el-col :span="21">
-              <el-form-item>
-                <el-form-item>
-                  <span>{{ temp.temporaryCard }}</span>
-                </el-form-item>
-              </el-form-item>
-            </el-col>
-          </el-row>
         </el-form>
       </div>
       <el-dialog :visible.sync="dialogVisible" width="1000px"
@@ -362,6 +360,14 @@ export default {
     /** 同意任务 */
     handleAgree() {
       this.agreeList.comment = this.dialogList.comment
+      if (this.agreeList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写同意意见！',
+          type: 'error'
+        })
+        return
+      }
       req.agreeTask(this.agreeList).then((response) => {
         if (response.success) {
           this.$message({
@@ -384,6 +390,14 @@ export default {
     /** 驳回任务 */
     handleReject() {
       this.regectList.comment = this.dialogList.comment
+      if (this.regectList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写驳回意见！',
+          type: 'error'
+        })
+        return
+      }
       req.rejectTask(this.regectList).then((response) => {
         if (response.success) {
           this.$message({
@@ -406,6 +420,14 @@ export default {
     /** 终止任务 */
     handleStop() {
       this.stopList.comment = this.dialogList.comment
+      if (this.stopList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写终止意见！',
+          type: 'error'
+        })
+        return
+      }
       req.breakTask(this.stopList).then((response) => {
         if (response.success) {
           this.$message({
@@ -483,10 +505,14 @@ export default {
   font-size: 14px;
   text-align: center;
 }
-.title{
+
+.titwu {
+  font-size: 28px;
   text-align: center;
+  padding: 30px 0 20px 0;
 }
-.tleftb{
+
+.tleftb {
   border-bottom: 0 !important;
   border-top: 1px solid #e0e3eb;
 }

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

@@ -54,20 +54,12 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="3">
-            <span>移库原因</span>
-          </el-col>
-          <el-col :span="21">
-            <el-input v-model="temp.changeReason" maxlength="125" placeholder="" class="addinputw" clearable/>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="3">
             <span><span class="icon">*</span>车架号</span>
           </el-col>
           <el-col :span="21">
-            <el-form-item prop="vinNo">
+            <el-form-item>
               <span>{{ temp.vinNo }}</span>
               <el-button size="small" type="primary" @click="selectVinNo" class="selectVinNoBtn">选择</el-button>
               <!--              <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">-->
@@ -78,24 +70,30 @@
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>申请费用</span>
+            <span>变更原因</span>
           </el-col>
           <el-col :span="21">
-            <el-input v-model="temp.applicantFunds" maxlength="125" placeholder="" class="addinputw" clearable
-                      @keyup.native="temp.applicantFunds = oninput(temp.applicantFunds,2)"/>
+            <el-input v-model="temp.changeReason" maxlength="125" placeholder="" class="addinputw" clearable/>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3"> <!--<span class="icon">*</span>-->
-            <span>移库操作人</span>
+          <el-col :span="3">
+            <span><span class="icon">*</span>经办人</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="operator">
-              <el-input v-model="temp.operator" maxlength="125" placeholder="" class="addinputw" clearable/>
-            </el-form-item>
+            <el-input v-model="temp.operator" maxlength="125" placeholder="" class="addinputw" clearable/>
+          </el-col>
+          <el-col :span="3">
+            <span>申请费用(元)</span>
           </el-col>
+          <el-col :span="9">
+            <el-input v-model="temp.applicantFunds" maxlength="125" placeholder="" class="addinputw" clearable
+                      @keyup.native="temp.applicantFunds = oninput(temp.applicantFunds,2)"/>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="3">
-            <span>保险状态</span>
+            <span><span class="icon">*</span>保险状态</span>
           </el-col>
           <el-col :span="9">
             <el-form-item prop="InsuranceStateKey">
@@ -103,6 +101,12 @@
               <el-radio v-model="temp.InsuranceStateKey" label="1">是</el-radio>
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <span>临牌</span>
+          </el-col>
+          <el-col :span="9">
+            <el-input v-model="temp.temporaryCard" maxlength="125" placeholder="" class="addinputw" clearable/>
+          </el-col>
         </el-row>
         <el-row v-show="temp.InsuranceStateKey == '1'">
           <el-col :span="3">
@@ -113,12 +117,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
-            <span>临牌</span>
-          </el-col>
-          <el-col :span="21">
-            <el-input v-model="temp.temporaryCard" maxlength="125" placeholder="" class="addinputw" clearable/>
-          </el-col>
+
         </el-row>
       </el-form>
     </div>
@@ -250,7 +249,7 @@ export default {
         }
       },
       rules: {
-        vinNo: [{ required: true, message: '车架号不能为空', trigger: 'change' }],
+        // vinNo: [{ required: true, message: '车架号不能为空', trigger: 'change' }],
         operator: [{ required: true, message: '经办人不能为空', trigger: 'change' }],
         InsuranceStateKey: [{ required: true, message: '保险状态不能为空', trigger: 'blur' }],
         location: [{ required: true, message: '现存放地点不能为空', trigger: 'change' }],
@@ -514,6 +513,17 @@ export default {
     },
     // 提交添加数据
     handleCreate() {
+      if (this.temp.vinNo == ''){
+        this.$message({
+          showClose: true,
+          message: '车架号不能为空！',
+          type: 'error'
+        })
+        return
+      }
+      if (this.temp.applicantFunds == ''){
+        this.temp.applicantFunds = '0'
+      }
       if (this.temp.InsuranceStateKey == '0') {
         this.temp.InsuranceState = '否'
         this.temp.policyImage = []
@@ -551,6 +561,25 @@ export default {
     },
     handleSubmit() {
       const _this = this
+      if (this.temp.vinNo == ''){
+        this.$message({
+          showClose: true,
+          message: '车架号不能为空！',
+          type: 'error'
+        })
+        return
+      }
+      if (this.temp.applicantFunds == ''){
+        this.temp.applicantFunds = '0'
+      }
+      if (this.temp.InsuranceStateKey == '0') {
+        this.temp.InsuranceState = '否'
+        this.temp.policyImage = []
+        this.imgList = []
+      }
+      if (this.temp.InsuranceStateKey == '1') {
+        this.temp.InsuranceState = '是'
+      }
       this.getUrl()
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
@@ -629,8 +658,10 @@ export default {
   font-size: 14px;
   text-align: center;
 }
-.title{
+.titwu{
+  font-size: 28px;
   text-align: center;
+  padding: 30px 0 20px 0;
 }
 
 .selectVinNoBtn {

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

@@ -47,29 +47,37 @@
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>移库原因</span>
+            <span>车架号</span>
           </el-col>
           <el-col :span="21">
             <el-form-item>
-              <span>{{ temp.changeReason }}</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.changeReason }}</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-col :span="9">
+            <el-form-item>
+              <span>{{ temp.operator }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <span>申请费用(元)</span>
+          </el-col>
+          <el-col :span="9">
             <el-form-item>
               <span>{{ temp.applicantFunds }}</span>
             </el-form-item>
@@ -77,19 +85,21 @@
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>移库操作人</span>
+            <span>保险状态</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ temp.operator }}</span>
+              <span>{{ temp.insuranceState }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>保险状态</span>
+            <span>临牌</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ temp.insuranceState }}</span>
+              <el-form-item>
+                <span>{{ temp.temporaryCard }}</span>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -103,18 +113,6 @@
                  :src="item" @click="open(temp.policyImage)">
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="3">
-            <span>临牌</span>
-          </el-col>
-          <el-col :span="21">
-            <el-form-item>
-              <el-form-item>
-                <span>{{ temp.temporaryCard }}</span>
-              </el-form-item>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
     </div>
     <el-dialog :visible.sync="dialogVisible" width="1000px"
@@ -318,7 +316,9 @@ export default {
   font-size: 14px;
   text-align: center;
 }
-.title{
+.titwu{
+  font-size: 28px;
   text-align: center;
+  padding: 30px 0 20px 0;
 }
 </style>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing.vue

@@ -209,7 +209,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 120  + 'px'
+        data: document.body.scrollHeight + 180  + 'px'
       }
     }, '*')
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut.vue

@@ -209,7 +209,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 120  + 'px'
+        data: document.body.scrollHeight + 180  + 'px'
       }
     }, '*')
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue

@@ -213,7 +213,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 120 + 'px'
+        data: document.body.scrollHeight + 180 + 'px'
       }
     }, '*')
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingInfo.vue

@@ -152,7 +152,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 120 + 'px'
+        data: document.body.scrollHeight + 180 + 'px'
       }
     }, '*')
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqing.vue

@@ -72,11 +72,11 @@
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center" width="140">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.invoiceTypeValue }}</span>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="发票类型" align="center" width="140">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut.vue

@@ -72,11 +72,11 @@
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center" width="140">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.invoiceTypeValue }}</span>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="发票类型" align="center" width="140">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue

@@ -102,13 +102,13 @@
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center" width="140">
-                  <template slot-scope="scope">
-                    <!--                    <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"-->
-                    <!--                              :readonly="vehicleList[scope.$index].inboundDate"/>-->
-                    <span>{{ scope.row.invoiceTypeValue }}</span>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="发票类型" align="center" width="140">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    &lt;!&ndash;                    <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                              :readonly="vehicleList[scope.$index].inboundDate"/>&ndash;&gt;-->
+<!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingInfo.vue

@@ -70,11 +70,11 @@
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center" width="140">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.invoiceTypeValue }}</span>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="发票类型" align="center" width="140">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue

@@ -72,11 +72,11 @@
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center" width="140">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.invoiceTypeValue }}</span>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="发票类型" align="center" width="140">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>