Merge tag 'Hotfix-zh-94' into develop

Finish Hotfix-zh-94

src/views/basic_data/material/material_list.vue

@@ -69,7 +69,8 @@
               align="left"
               label="使用组织"
               prop="useOrgName"
-              min-width="100"
+              min-width="200"
+              show-overflow-tooltip
             />
             <el-table-column
               align="left"
@@ -78,6 +79,7 @@
               min-width="200"
               label-class-name="bianma"
               class-name="fontstyle"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
               <CopyButton :copyText="scope.row.number" />
@@ -114,6 +116,7 @@
               label="数据状态"
               prop="forbidStatus"
               min-width="100"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-tag size="mini" v-if="scope.row.forbidStatus == 'A'" type="success"
@@ -134,6 +137,7 @@
               label="是否维护商城资料"
               prop="maintainData"
               min-width="100"
+              show-overflow-tooltip
             />
 <!--            <el-table-column-->
 <!--              align="left"-->
@@ -153,12 +157,14 @@
               label="基本单位"
               prop="baseUnitId"
               min-width="100"
+              show-overflow-tooltip
             />
             <el-table-column
               align="left"
               label="已使用"
               prop="used"
               min-width="100"
+              show-overflow-tooltip
             />
             <el-table-column
               align="center"

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -910,23 +910,27 @@ export default {
           this.dataList = res.data
         })
       } else if (this.engineering == '直调发货') {
-        getList({
+        getListProject({
           pageSize: -1,
           pageNum: 1,
-          enginRecordNo: this.$parent.refEnginRecordNo
+          type:3,
+          refEnginRecordNo: this.$parent.refEnginRecordNo,
+          examineStatus: 'OK'
         }).then((res) => {
           this.goodsList = res.data.records
         })
       } else {
-        getListProject({
+
+      getList({
           pageSize: -1,
           pageNum: 1,
-          type:3,
-          refEnginRecordNo: this.$parent.refEnginRecordNo,
-          examineStatus: 'OK'
+         orderType   :'TRADE',
+          enginRecordNo: this.$parent.refEnginRecordNo
         }).then((res) => {
           this.projectList = res.data.records
         })
+
+
       }
     },
     // 批量下载

src/views/deposit_commerce/deposit_list.vue

@@ -147,7 +147,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="区域" prop="refRegionWork">
                   <el-input
                     v-model="screenForm.refRegionWork"
@@ -155,8 +155,8 @@
                   />
                 </el-form-item>
               </el-col>
-                 <el-col :xs="24" :sm="12" :lg="12">
-                <el-form-item label="安装日期" >
+                 <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期"  style="margin-bottom:22px">
                   <div class="fanwei">
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
@@ -180,7 +180,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="机型" >
                   <div class="fanwei">
                      <el-form-item prop="startSpecification">
@@ -193,7 +193,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="特价编号" >
                   <div class="fanwei">
                      <el-form-item prop="startSpecialNo">
@@ -206,7 +206,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                <el-form-item label="厂编号" >
                   <div class="fanwei">
                      <el-form-item prop="startRefFactoryNo">
@@ -327,7 +327,7 @@
               align="left"
               label="经销商名称"
               prop="customerName"
-              min-width="160"
+              min-width="300"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -335,13 +335,18 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column
+             <el-table-column
               align="left"
-              label="是否免扣"
-              prop=""
-              min-width="160"
+              label="规格型号"
+              prop="specification"
+              min-width="300"
               show-overflow-tooltip
-            ></el-table-column> -->
+            >
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               align="left"
               label="是否退押"

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

@@ -910,23 +910,27 @@ export default {
           this.dataList = res.data
         })
       } else if (this.engineering == '直调发货') {
-        getList({
+        getListProject({
           pageSize: -1,
           pageNum: 1,
-          enginRecordNo: this.$parent.refEnginRecordNo
+          type:3,
+          refEnginRecordNo: this.$parent.refEnginRecordNo,
+          examineStatus: 'OK'
         }).then((res) => {
           this.goodsList = res.data.records
         })
       } else {
-        getListProject({
+
+ getList({
           pageSize: -1,
           pageNum: 1,
-          type:3,
-          refEnginRecordNo: this.$parent.refEnginRecordNo,
-          examineStatus: 'OK'
+              orderType   :'HOME',
+          enginRecordNo: this.$parent.refEnginRecordNo
         }).then((res) => {
-          this.projectList = res.data.records
+          this.projectList= res.data.records
         })
+
+
       }
     },
     // 批量下载

src/views/deposit_home/deposit_list.vue

@@ -133,7 +133,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="区域" prop="refRegionWork">
                   <el-input
                     v-model="screenForm.refRegionWork"
@@ -142,8 +142,8 @@
                 </el-form-item>
               </el-col>
 
-                   <el-col :xs="24" :sm="12" :lg="12">
-                <el-form-item label="安装日期" >
+                   <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期" style="margin-bottom:22px">
                   <div class="fanwei">
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
@@ -167,7 +167,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="机型" >
                   <div class="fanwei">
                      <el-form-item prop="startSpecification">
@@ -180,7 +180,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="特价编号" >
                   <div class="fanwei">
                      <el-form-item prop="startSpecialNo">
@@ -193,7 +193,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12">
+              <el-col :xs="24" :sm="12" :lg="6">
                <el-form-item label="厂编号" >
                   <div class="fanwei">
                      <el-form-item prop="startRefFactoryNo">
@@ -303,7 +303,7 @@
               align="left"
               label="经销商名称"
               prop="customerName"
-              min-width="160"
+              min-width="300"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -311,13 +311,18 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column
+              <el-table-column
               align="left"
-              label="是否免扣"
-              prop=""
-              min-width="160"
+              label="规格型号"
+              prop="specification"
+              min-width="300"
               show-overflow-tooltip
-            ></el-table-column> -->
+            >
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               align="left"
               label="是否退押"