Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

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

@@ -845,12 +845,12 @@ export default {
                       </el-form-item>
                     </div>
                   </el-descriptions-item>
-                  <el-descriptions-item label="出库仓库">
+                  <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}
+                          disabled={this.formDialogType === 2 || !((this.formDialogType === 1) || (this.formDialogType === 3 && this.formData.isImport==true && !!this.formData.id))}
                           value={this.formData.storageId}
                           onInput={val => {
                             this.formData.storageId = val