Merge tag 'Hotfix-zh-97' into develop

Finish Hotfix-zh-97

src/views/deposit_commerce/deposit_list.vue

@@ -156,15 +156,15 @@
                 </el-form-item>
               </el-col>
                  <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期"  style="margin-bottom:22px">
+                <el-form-item label="安装日期"   style="margin-bottom:0">
                   <div class="fanwei">
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
-                  v-model="screenForm.startInstallTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                        v-model="screenForm.startInstallTime"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
 
                      </el-form-item>
                       <span>-</span>
@@ -181,42 +181,22 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="机型" >
-                  <div class="fanwei">
-                     <el-form-item prop="startSpecification">
+                <el-form-item label="机型" prop="startSpecification">
                         <el-input  v-model="screenForm.startSpecification" ></el-input>
-                     </el-form-item>
-                      <span>-</span>
-                    <el-form-item prop="endSpecification">
-                    <el-input  v-model="screenForm.endSpecification" ></el-input>
-                     </el-form-item>
-                  </div>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="特价编号" >
-                  <div class="fanwei">
-                     <el-form-item prop="startSpecialNo">
+                  <el-form-item label="特价编号" prop="startSpecialNo">
+
                         <el-input  v-model="screenForm.startSpecialNo" ></el-input>
-                     </el-form-item>
-                  <span>-</span>
-                    <el-form-item prop="endSpecialNo">
-                    <el-input  v-model="screenForm.endSpecialNo" ></el-input>
-                     </el-form-item>
-                  </div>
+
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="厂编号" >
-                  <div class="fanwei">
-                     <el-form-item prop="startRefFactoryNo">
+               <el-form-item label="厂编号" prop="startRefFactoryNo">
+
                         <el-input  v-model="screenForm.startRefFactoryNo" ></el-input>
-                     </el-form-item>
-                  <span>-</span>
-                    <el-form-item prop="endRefFactoryNo">
-                    <el-input  v-model="screenForm.endRefFactoryNo" ></el-input>
-                     </el-form-item>
-                  </div>
+
                 </el-form-item>
 
               </el-col>

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

@@ -921,11 +921,11 @@ export default {
         })
       } else {
 
- getList({
+        getListProject({
           pageSize: -1,
           pageNum: 1,
-              orderType   :'HOME',
-          enginRecordNo: this.$parent.refEnginRecordNo
+          refEnginRecordNo: this.$parent.refEnginRecordNo,
+          examineStatus: 'OK'
         }).then((res) => {
           this.projectList= res.data.records
         })

src/views/deposit_home/deposit_list.vue

@@ -143,7 +143,7 @@
               </el-col>
 
                    <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期" style="margin-bottom:22px">
+                <el-form-item label="安装日期" style="margin-bottom:0">
                   <div class="fanwei">
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
@@ -167,46 +167,28 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="机型" >
-                  <div class="fanwei">
-                     <el-form-item prop="startSpecification">
+               <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>
-                      <span>-</span>
-                    <el-form-item prop="endSpecification">
-                    <el-input  v-model="screenForm.endSpecification" ></el-input>
-                     </el-form-item>
-                  </div>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="特价编号" >
-                  <div class="fanwei">
-                     <el-form-item prop="startSpecialNo">
+                  <el-form-item label="特价编号" prop="startSpecialNo">
+
                         <el-input  v-model="screenForm.startSpecialNo" ></el-input>
-                     </el-form-item>
-                  <span>-</span>
-                    <el-form-item prop="endSpecialNo">
-                    <el-input  v-model="screenForm.endSpecialNo" ></el-input>
-                     </el-form-item>
-                  </div>
+
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="厂编号" >
-                  <div class="fanwei">
-                     <el-form-item prop="startRefFactoryNo">
+               <el-form-item label="厂编号" prop="startRefFactoryNo">
+
                         <el-input  v-model="screenForm.startRefFactoryNo" ></el-input>
-                     </el-form-item>
-                  <span>-</span>
-                    <el-form-item prop="endRefFactoryNo">
-                    <el-input  v-model="screenForm.endRefFactoryNo" ></el-input>
-                     </el-form-item>
-                  </div>
+
                 </el-form-item>
 
               </el-col>
+
+              </el-col>
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">

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

@@ -784,10 +784,12 @@ 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
         })
@@ -795,7 +797,7 @@ export default {
         getListProject({
           pageSize: -1,
           pageNum: 1,
-          type:3,
+
           refEnginRecordNo: this.$parent.refEnginRecordNo,
           examineStatus: 'OK'
         }).then((res) => {

src/views/supply/implement/implement_list.vue

@@ -57,6 +57,19 @@
                 <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
             </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="存货类别" prop="k3CategoryNumber">
+                 <el-select v-model="screenForm.k3CategoryNumber" filterable  placeholder="请选择">
+                    <el-option
+                      v-for="item in categoryList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+              </el-form-item>
+              <!-- categoryList -->
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="下单日期" prop="date">
                 <el-date-picker
@@ -70,7 +83,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -90,11 +103,11 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
@@ -143,6 +156,7 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="right" label="钱包" prop="walletName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
@@ -196,13 +210,13 @@
         </div>
       </div>
     </div>
-    
+
   </div>
 </template>
 
 <script>
 import { getList } from "@/api/supply/implement";
-
+import { getCategoryList } from "@/api/common"
 let that
 export default {
   filters: {
@@ -230,7 +244,9 @@ export default {
         saleMan2: '',
         enginName: '',
         loginNum: '',
+        k3CategoryNumber:''
       },
+      categoryList:[],
       statusList: [
         { label: '政策零售订单', value: '2' },
         { label: '零售订单', value: '1' },
@@ -255,6 +271,7 @@ export default {
         newServiceName: this.screenForm.saleMan2,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
+        k3CategoryNumber:this.screenForm.k3CategoryNumber
       }
     },
   },
@@ -265,6 +282,7 @@ export default {
 
   created() {
     this.getList();
+    this.getCategoryList()
   },
 
   methods: {
@@ -296,6 +314,7 @@ export default {
         newServiceName: this.screenForm.saleMan2,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
+        k3CategoryNumber:this.screenForm.k3CategoryNumber
       };
       getList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -307,7 +326,17 @@ export default {
         this.listLoading = false;
       })
     },
+    // 获取存货类别列表
+  getCategoryList(){
+    getCategoryList({
+      pageNum:1,
+      pageSize:-1,
+      keyword:''
+    }).then(res=>{
 
+      this.categoryList =   res.data.records
+    })
+  },
     // 提交筛选表单
     submitScreenForm() {
       this.currentPage = 1;