no message

src/views/deposit_commerce/deposit_list.vue

@@ -181,21 +181,21 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="机型" prop="startSpecification">
-                        <el-input  v-model="screenForm.startSpecification" ></el-input>
+                <el-form-item label="规格型号" prop="specification">
+                        <el-input  v-model="screenForm.specification" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="特价编号" prop="startSpecialNo">
+                  <el-form-item label="特价编号" prop="specialNo">
 
-                        <el-input  v-model="screenForm.startSpecialNo" ></el-input>
+                        <el-input  v-model="screenForm.specialNo" ></el-input>
 
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="厂编号" prop="startRefFactoryNo">
+               <el-form-item label="跨区厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.startRefFactoryNo" ></el-input>
+                        <el-input  v-model="screenForm.refFactoryNo" ></el-input>
 
                 </el-form-item>
 
@@ -515,23 +515,15 @@ export default {
         startSubmitTime: "",
         startConfirmTime: "",
         isRefundDeposit: null,
-        examineStatus: null,
-        refUseUnit: "",
         startInstallTime: "",
         endConfirmTime: "",
         endInstallTime: "",
-        startSpecification:'',
-        startSpecialNo:'',
-        startRefFactoryNo:'',
-        endSpecification:'',
-        endSpecialNo:'',
-        endRefFactoryNo:'',
+        specification:'',
+        refFactoryNo:'',
         factoryNo: "",
         specialNo: "",
-        confirmName: "",
         refRegionWork: "",
-         endSubmitTime:'',
-        startSubmitTime:''
+        endSubmitTime:'',
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: "全部",

src/views/deposit_commerce/refund_list.vue

@@ -42,36 +42,18 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="机型" prop="startSpecification">
-                <!-- <div class="fanwei">
-                  <el-input v-model="searchForm.startSpecification"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endSpecification"></el-input>
-                </div> -->
-                <el-input v-model="searchForm.startSpecification" placeholder="请输入"></el-input>
+              <el-form-item label="规格型号" prop="specification">
+                <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <!-- <el-form-item label="特价编号" prop="refProjectName">
-                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
-              </el-form-item> -->
-              <el-form-item label="特价编号" prop="startSpecialNo">
-                <!-- <div class="fanwei">
-                  <el-input v-model="searchForm.startSpecialNo"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endSpecialNo"></el-input>
-                </div> -->
-                <el-input v-model="searchForm.startSpecialNo" placeholder="请输入"></el-input>
+              <el-form-item label="特价编号" prop="specialNo">
+                <el-input v-model="searchForm.specialNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="厂编号" prop="startRefFactoryNo">
-                <!-- <div class="fanwei">
-                  <el-input v-model="searchForm.startRefFactoryNo"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endRefFactoryNo"></el-input>
-                </div> -->
-                <el-input v-model="searchForm.startRefFactoryNo" placeholder="请输入"></el-input>
+              <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                <el-input v-model="searchForm.refFactoryNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -321,12 +303,9 @@ export default {
         customerKeyword: "",
         refProjectName: "",
         confirmName: "",
-        startSpecification: "",
-        endSpecification: "",
-        startSpecialNo: "",
-        endSpecialNo: "",
-        startRefFactoryNo: "",
-        endRefFactoryNo: "",
+        specification: "",
+        specialNo: "",
+        refFactoryNo: "",
         startInstallTime: "",
         endInstallTime: "",
         refRegionWork: "",

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -15,7 +15,15 @@
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">
             <div class="label">项目类别</div>
-            <div class="value">{{ details.refProjectName }}</div>
+            <div class="value">{{ details.refProjectCategory }}</div>
+          </el-col>
+          <el-col :xs="12" :sm="8" :lg="8" class="item">
+            <div class="label">行业类别</div>
+            <div class="value">{{ details.refTradeCategory }}</div>
+          </el-col>
+          <el-col :xs="12" :sm="8" :lg="8" class="item">
+            <div class="label">区域</div>
+            <div class="value">{{ details.refRegionWork }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">
             <div class="label">工程编号</div>
@@ -44,15 +52,16 @@
           </el-col>
 
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">厂工程编码</div>
+            <div class="label">跨区厂编号</div>
             <div class="value">
-              <el-form-item prop="refFactoryNo">
-                <el-input
-                  v-model="details.refFactoryNo"
-                  placeholder="厂工程编码"
-                  size="small"
-                />
-              </el-form-item>
+              {{ details.refFactoryNo }}
+<!--              <el-form-item prop="refFactoryNo">-->
+<!--                <el-input-->
+<!--                  v-model="details.refFactoryNo"-->
+<!--                  placeholder="厂工程编码"-->
+<!--                  size="small"-->
+<!--                />-->
+<!--              </el-form-item>-->
             </div>
           </el-col>
 

src/views/deposit_home/components/refund_list-detail.vue

@@ -197,24 +197,24 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-          <el-table-column align="left" label="跨区厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
+          <el-table-column align="left" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.factoryNo" />
               <span>{{scope.row.factoryNo}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialOldNumber" />
-              <span>{{scope.row.materialOldNumber}}</span>
-            </template>
-          </el-table-column>
           <el-table-column align="left" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.specialNo" />
               <span>{{scope.row.specialNo}}</span>
             </template>
           </el-table-column>
+          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialOldNumber" />
+              <span>{{scope.row.materialOldNumber}}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.materialNumber" />
@@ -702,4 +702,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/deposit_home/deposit_list.vue

@@ -41,6 +41,11 @@
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="行业类别" prop="refTradeCategory">
+                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
                 <el-input
                   v-model="screenForm.refUseUnit"
@@ -168,21 +173,21 @@
                 </el-form-item>
               </el-col>
                <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="机型" prop="startSpecification">
-                        <el-input  v-model="screenForm.startSpecification" ></el-input>
+                <el-form-item label="规格型号" prop="specification">
+                        <el-input  v-model="screenForm.specification" placeholder="请输入规格型号" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="特价编号" prop="startSpecialNo">
+                  <el-form-item label="特价编号" prop="specialNo">
 
-                        <el-input  v-model="screenForm.startSpecialNo" ></el-input>
+                        <el-input  v-model="screenForm.specialNo" placeholder="请输入特价编号" ></el-input>
 
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="厂编号" prop="startRefFactoryNo">
+               <el-form-item label="跨区厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.startRefFactoryNo" ></el-input>
+                        <el-input  v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号" ></el-input>
 
                 </el-form-item>
 
@@ -482,28 +487,21 @@ export default {
         examineStatus: '', // 状态
         refEnginRecordNo: '', // 登录单号
         refProjectName: '', // 项目名称
+        refTradeCategory: '',
         refUseUnit: '', // 使用单位
         startDeliverTime: '', // 发货申请日期-开始
         startSubmitTime:'',
         startConfirmTime:'',
         isRefundDeposit:null,
-        examineStatus:null,
-        refUseUnit:'',
         endConfirmTime:'',
         startInstallTime:'',
         endInstallTime:'',
-        startSpecification:'',
-        startSpecialNo:'',
-        startRefFactoryNo:'',
-        endSpecification:'',
-        endSpecialNo:'',
-        endRefFactoryNo:'',
+        specification:'',
+        refFactoryNo:'',
         factoryNo:'',
         specialNo:'',
-        confirmName:'',
         refRegionWork:'',
-        endSubmitTime:'',
-        startSubmitTime:''
+        endSubmitTime:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -600,7 +598,7 @@ export default {
         for (let i = 0; i < this.selectData.length; i++) {
           arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles('/deposit-manage/export', { id: arr,orderType:'HOME' })
+        downloadFiles('/deposit-manage/export', { id: arr, orderType:'HOME' })
       } else {
         this.$errorMsg('请选择押金项')
       }

src/views/deposit_home/refund_list.vue

@@ -32,6 +32,11 @@
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="行业类别" prop="refTradeCategory">
+                <el-input v-model="searchForm.refTradeCategory" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refProjectName">
                 <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
               </el-form-item>
@@ -42,39 +47,26 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="机型" prop="startSpecification">
-                <!-- <div class="fanwei">
-                  <el-input v-model="searchForm.startSpecification"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endSpecification"></el-input>
-                </div> -->
-                <el-input v-model="searchForm.startSpecification" placeholder="请输入"></el-input>
+              <el-form-item label="规格型号" prop="specification">
+                <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <!-- <el-form-item label="特价编号" prop="refProjectName">
-                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
-              </el-form-item> -->
-              <el-form-item label="特价编号" prop="startSpecialNo">
-                <!-- <div class="fanwei">
-                  <el-input v-model="searchForm.startSpecialNo"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endSpecialNo"></el-input>
-                </div> -->
-                <el-input v-model="searchForm.startSpecialNo" placeholder="请输入"></el-input>
+              <el-form-item label="特价编号" prop="specialNo">
+                <el-input v-model="searchForm.specialNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="厂编号" prop="startRefFactoryNo">
-                <!-- <div class="fanwei">
-                  <el-input v-model="searchForm.startRefFactoryNo"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endRefFactoryNo"></el-input>
-                </div> -->
-                <el-input v-model="searchForm.startRefFactoryNo" placeholder="请输入"></el-input>
+              <el-form-item label="跨区厂编号" prop="startRefFactoryNo">
+                <el-input v-model="searchForm.refFactoryNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="12" :sm="12" :lg="12">
               <el-form-item label="安装日期" prop="">
                 <div class="fanwei">
                   <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
@@ -94,11 +86,6 @@
                 <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发货申请开始日期" prop="startDeliverTime">
                 <el-date-picker
@@ -320,12 +307,13 @@ export default {
         refEnginRecordNo: "",
         customerKeyword: "",
         refProjectName: "",
+        refTradeCategory: '',
         confirmName: "",
-        startSpecification: "",
+        specification: "",
         endSpecification: "",
-        startSpecialNo: "",
+        specialNo: "",
         endSpecialNo: "",
-        startRefFactoryNo: "",
+        refFactoryNo: "",
         endRefFactoryNo: "",
         startInstallTime: "",
         endInstallTime: "",