Merge branch 'linwenxin_dev' into pengyouhao_dev

src/views/auxiliaryFittings/purchasingManagement/components/inStorage.vue

@@ -59,6 +59,7 @@ export default {
         "updateTime": "",
         "venderId": "",
         "venderName": "",
+        storageId:"",
         "websitId": "",
         "websitName": "",
         items: [],

src/views/auxiliaryFittings/purchasingManagement/components/retStorage.vue

@@ -63,6 +63,7 @@ export default {
         "updateTime": "",
         "venderId": "",
         "venderName": "",
+        storageId:"",
         "websitId": "",
         "websitName": "",
         items: [],

src/views/auxiliaryFittings/purchasingManagement/mixins/form_tpl.js

@@ -12,6 +12,7 @@ import {
 } from '@/api/purchasingManagement.js'
 import { commonTemplateDownload } from '@/api/common.js'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
+import { storageListPageV2 } from "@/api/storage";
 export default {
   data() {
     return {
@@ -34,7 +35,8 @@ export default {
       materialNormList: [],
       peijianList: [],
       websitPurchaseInList: [],
-      listPageV2Data: []
+      listPageV2Data: [],
+      cangkuList: []
     }
   },
   computed: {
@@ -760,10 +762,10 @@ export default {
                 <el-descriptions
                   border
                   title=""
-                  column={2}
+                  column={4}
                   colon={false}
                   labelStyle={{ width: '8%' }}
-                  contentStyle={{ width: '42%' }}
+                  contentStyle={{ width: '17%' }}
                   style="margin-top:-1px"
                 >
                   <el-descriptions-item label="网点名称">
@@ -843,6 +845,37 @@ export default {
                       </el-form-item>
                     </div>
                   </el-descriptions-item>
+                  <el-descriptions-item label={!!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.$route?.name)?'入库仓库':"出库仓库"}>
+                    <div class="redbordererr">
+                      <el-form-item label="" lebel-width="0px" prop={`storageId`} rules={required}>
+                        <el-select
+                          style="width:100%"
+                          disabled={this.formDialogType === 2 || !(!this.formData.id || (this.formDialogType === 1) || (this.formDialogType === 3 && this.formData.isImport==true && !!this.formData.id))}
+                          value={this.formData.storageId}
+                          onInput={val => {
+                            this.formData.storageId = val
+                          }}
+                          placeholder="请选择"
+                          onChange={val => {
+                            if (val) {
+                              this.formData['storageName'] = this.cangkuList.find(
+                                item => item.storageId == val
+                              )?.storageName
+                            } else {
+                              this.formData['storageName'] = ''
+                            }
+                          }}
+                        >
+                          {this.cangkuList.map(item => (
+                            <el-option key={item.storageId} label={item.storageName} value={item.storageId}></el-option>
+                          ))}
+                        </el-select>
+                      </el-form-item>
+                    </div>
+                  </el-descriptions-item>
+                  <el-descriptions-item label="">
+                    
+                  </el-descriptions-item>
                 </el-descriptions>
                 {!!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.$route?.name) ? (
                   <el-descriptions
@@ -1106,9 +1139,7 @@ export default {
     // 打开
     openForm() {
       this.getorderlist(false)
-
       var req = [getWebsit({ type: 'C', status: true })]
-
       var runs = [
         res => {
           this.getWebsitList = res.data.filter(item => item.type == 'C')
@@ -1125,6 +1156,14 @@ export default {
                 { param: 'a.status', compare: '=', value: 'ON' },
                 { param: 'a.vender_type', compare: 'like', value: '辅材' }
               ]
+            }),
+            storageListPageV2({
+              "pageNum":1, 
+              "pageSize":-1, 
+              "params":[
+                {"param":"a.type","compare":"like","value":"辅材"},
+                {"param":"a.status","compare":"=","value":"true"}
+              ]
             })
           ]
         )
@@ -1132,6 +1171,9 @@ export default {
           ...[
             res => {
               this.listPageV2Data = res.data.records
+            },
+            res => {
+              this.cangkuList = res.data.records
             }
           ]
         )
@@ -1145,6 +1187,14 @@ export default {
                 { param: 'a.status', compare: '=', value: 'ON' },
                 { param: 'a.vender_type', compare: 'like', value: '配件' }
               ]
+            }),
+            storageListPageV2({
+              "pageNum":1, 
+              "pageSize":-1, 
+              "params":[
+                {"param":"a.type","compare":"like","value":"配件"},
+                {"param":"a.status","compare":"=","value":"true"}
+              ]
             })
           ]
         )
@@ -1152,11 +1202,13 @@ export default {
           ...[
             res => {
               this.listPageV2Data = res.data.records
+            },
+            res => {
+              this.cangkuList = res.data.records
             }
           ]
         )
       }
-
       if (~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.$route?.name)) {
         req.push(
           ...[
@@ -1211,7 +1263,6 @@ export default {
           ]
         )
       }
-
       Promise.all(req).then(ress => {
         ress.forEach((res, index) => {
           runs[index](res)