Merge remote-tracking branch 'origin/dev' into dev

src/views/material/basicFile/details.vue

@@ -974,7 +974,7 @@
       },
       // 切换副表信息
       handleViceTabClick(e) {
-        console.log(this.basicMessage[e.index], '切换标签');
+        // console.log(this.basicMessage[e.index], '切换标签');
         this.activeViceTab = this.basicMessage[e.index].code;
 
         switch (this.activeViceTab) {

src/views/material/basicFile/index.vue

@@ -464,7 +464,7 @@
 
       // 删除文件
       handleFileRemove(file, fileList) {
-        console.log('删除文件', file, 'file', fileList, 'fileList');
+        // console.log('删除文件', file, 'file', fileList, 'fileList');
         this.importData.list = fileList;
       },
       // 文件发生改变

src/views/material/requisition/add.vue

@@ -769,7 +769,7 @@
           // 四级分类/物料分类
           classifyId: '',
           // 是否医药物料
-          isMedicine: '2',
+          isMedicine: '0',
           // DI
           diCode: '',
           // 物料名称
@@ -1047,7 +1047,7 @@
           this.getInnerPackingUnitDetails(this.row.innerPackingUnit)
         }
       } else if (this.pageStu == 'add') {
-        // alert('新增页面')
+        this.controlMedic('0');
         console.log('页面状态', this.pageStu)
       } else if (this.pageStu === 'copy') {
         this.getDetails(this.row)
@@ -1374,7 +1374,10 @@
           })
 
           // Promise.all([form1, form2]).then(() => {
-            if (this.basicForm.isMedicine == '0' && this.sysMaterialMedcineItemApply.length == 0) {
+            if (this.basicForm.isMedicine == '0' 
+                && this.sysMaterialMedcineItemApply.length == 0 
+                // && this.basicForm.oneClass !== "资产费用&7"
+                ) {
               this.$modal.notifyWarning("医药物料需要维护物料类别!");
 
             } else {
@@ -1419,7 +1422,10 @@
           })
 
           // Promise.all([form1, form2]).then(() => {
-            if (this.basicForm.isMedicine == '0' && this.sysMaterialMedcineItemApply.length == 0) {
+            if (this.basicForm.isMedicine == '0' 
+                && this.sysMaterialMedcineItemApply.length == 0 
+                // && this.basicForm.oneClass !== "资产费用&7"
+              ) {
               this.$modal.notifyWarning("医药物料需要维护物料类别!");
             } else {
               this.$modal.loading("保存中...");
@@ -1700,7 +1706,7 @@
           console.log('内包装单位回显', res)
           if (res.code === 200) {
             this.innerPackingUnitOptions = res.data.tableBody
-            console.log('1111', this.innerPackingUnitOptions)
+            // console.log('1111', this.innerPackingUnitOptions)
           }
         })
       },

src/views/material/requisition/index.vue

@@ -26,10 +26,16 @@
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button :size="size" @click="handleImport">批量导入</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button :size="size" @click="handleBatchSubmit">批量提交</el-button>
+          
+          <el-button-group >
+            <el-button :size="size" @click="handleImport">批量导入</el-button>
+            <el-button  
+            :size="size"
+              @click="handleDownload" 
+              v-hasPermi="['system:apply:export']"
+            >批量导出</el-button>
+            <el-button :size="size" @click="handleBatchSubmit">批量提交</el-button>
+          </el-button-group>
         </el-col>
         <!-- 导入弹窗 -->
         <el-dialog 
@@ -143,10 +149,10 @@
     name: 'requisition',
     dicts:[...initDicts([...SearchColumns,...TableColumns])],
     components: {
-      addReq,
-      ElSuperTable: () => import("@/components/super-table/index.vue"),
-      ElSuperSearch: () => import("@/components/super-search/index.vue"),
-    },
+    addReq,
+    ElSuperTable: () => import("@/components/super-table/index.vue"),
+    ElSuperSearch: () => import("@/components/super-search/index.vue"),
+},
     data() {
       const params = this.$init.params(SearchColumns);
       return {
@@ -301,9 +307,16 @@
       handleImport() {
         this.importData.show = true
       },
+      // 导出
+      handleDownload(){
+        let params = {
+          ...this.params
+        };
+        this.download('/system/apply/material/export', {...params}, `物料申请单${new Date().getTime()}.xlsx`);
+      },
       // 删除文件
       handleFileRemove(file, fileList) {
-        console.log('删除文件', file, 'file', fileList, 'fileList');
+        // console.log('删除文件', file, 'file', fileList, 'fileList');
         this.importData.list = fileList;
       },
       // 文件发生改变
@@ -331,7 +344,7 @@
                   this.importData.list = [];
                   if (res.data.flag) {
                     this.failLoad = true;
-                    console.log(res.data.datas)
+                    // console.log(res.data.datas)
                     let param = {failDatas: res.data.datas}
                     if (null != param) {
 
@@ -376,11 +389,11 @@
 
         this.checkedList = selection;
 
-        console.log(this.checkedList, 'this.checkedList');
+        // console.log(this.checkedList, 'this.checkedList');
 
       },
       getList(val) {
-        console.log('val', val)
+        // console.log('val', val)
         this.failLoad = true;
         
         getReqList({...this.params,...this.pageStatus}).then(res => {
@@ -410,7 +423,7 @@
         this.checkedList = selection;
       },
       check(row) {
-        console.log('查看详情', row)
+        // console.log('查看详情', row)
         this.isList = false
         this.isComponent = 'addReq'
         this.page = 'check'
@@ -418,7 +431,7 @@
         this.disable = true
       },
       edit(row) {
-        console.log('修改先加载详情', row)
+        // console.log('修改先加载详情', row)
         this.isList = false
         this.isComponent = 'addReq'
         this.page = 'edit'
@@ -426,7 +439,7 @@
         this.disable = false
       },
       commit(row) {
-        console.log('row', row)
+        // console.log('row', row)
       },
       deleteRow(row) {
         this.$confirm('是否删除此条数据?', '提示', {
@@ -446,16 +459,16 @@
         }).catch(() => {
         })
       },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-        this.queryParams.pageSize = val
-        this.getList(this.queryParams)
-      },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
-        this.queryParams.pageNum = val
-        this.getList(this.queryParams)
-      }
+      // handleSizeChange(val) {
+      //   console.log(`每页 ${val} 条`);
+      //   this.queryParams.pageSize = val
+      //   this.getList(this.queryParams)
+      // },
+      // handleCurrentChange(val) {
+      //   console.log(`当前页: ${val}`);
+      //   this.queryParams.pageNum = val
+      //   this.getList(this.queryParams)
+      // }
     }
   }
 </script>

src/views/purchase/DemandSummary/add.vue

@@ -41,20 +41,32 @@
         <!-- <el-table-column show-overflow-tooltip label="末级供应仓库存量" align="center" prop="lastWarehouseQty" width="150"/> -->
         <el-table-column show-overflow-tooltip label="月销量" align="center" prop="totalMonthlySales"/>
         <el-table-column show-overflow-tooltip label="采购周期" align="center" prop="puPeriod"/>
-        <el-table-column show-overflow-tooltip label="最终净需求量" align="center" prop="resDemandQty" width="120"/>
+        <el-table-column show-overflow-tooltip label="最终净需求量" align="center" prop="resDemandQty" width="120">
+          <template slot-scope="scope">
+            {{scope.row.resDemandQty ? parseFloat(scope.row.resDemandQty).toFixed(0) : '0'}}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="最终采购量" align="center" prop="puQtyRes" width="120">
           <template slot-scope="scope">
-            <el-input size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.puQtyRes"/>
+            <el-input clearable type="number" min="0" size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.puQtyRes"/>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip label="需求客户" align="center" prop="customerName" width="150"/>
-        <el-table-column show-overflow-tooltip label="最小订货量" align="center" prop="minOrderQty" width="100"/>
+        <el-table-column show-overflow-tooltip label="最小订货量" align="center" prop="minOrderQty" width="100">
+          <template slot-scope="scope">
+            {{scope.row.minOrderQty ? parseFloat(scope.row.minOrderQty).toFixed(0) : '0'}}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="最小包装量" align="center" prop="minPackage" width="100"/>
-        <el-table-column show-overflow-tooltip label="最小批量" align="center" prop="minBatch" width="100"/>
+        <el-table-column show-overflow-tooltip label="最小批量" align="center" prop="minBatch" width="100">
+          <template slot-scope="scope">
+            {{scope.row.minBatch ? parseFloat(scope.row.minBatch).toFixed(0) : '0'}}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="修改人" align="center" prop="updateByName" width="100"/>
         <el-table-column show-overflow-tooltip label="修改原因" align="center" prop="updateCause" width="150">
           <template slot-scope="scope">
-            <el-input size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.updateCause"/>
+            <el-input clearable size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.updateCause"/>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip label="业务备注" align="center" prop="remark" width="150"/>
@@ -97,7 +109,7 @@
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="120"/>
         <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="orgName" width="250px">
           <template slot-scope="scope">
-              <el-input :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
+              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
                 <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
               </el-input>
           </template>
@@ -278,6 +290,9 @@ export default {
         }
       }).then(() => {
         this.loading = false
+        this.tableList.forEach(item => {
+          item.puQtyRes = parseInt(item.puQtyRes)
+        })
       }).catch(err => {
         this.loading = false
       })

src/views/purchase/PurchaseDemandList/index.vue

@@ -209,7 +209,7 @@
             <el-button type="text" size="mini" @click="check(scope.row)">查看</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="edit(scope.row)">编辑</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="commit(scope.row)">提交</el-button>
-            <!-- <el-button type="text" size="mini" v-if="scope.row.status == '1' && scope.row.flowId" @click="reback(scope.row)">收回</el-button> -->
+            <el-button type="text" size="mini" v-if="scope.row.status == '1' && scope.row.flowId" @click="reback(scope.row)">收回</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="deleteids(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -429,6 +429,8 @@ export default {
           return '已完成'
         case '3':
           return '已驳回'
+        case '9':
+          return '已回退'
       }
     },
     formatterBillType(row) {

src/views/purchase/apply/add/columns.js

@@ -169,6 +169,7 @@ export default function useColumns() {
           item: { key: "conversionRate", title: "采购换算率", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             value: 1,
             disabled: true,
@@ -188,6 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -255,6 +257,7 @@ export default function useColumns() {
           item: { key: "recentlyPrice", title: "最近价格" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             disabled: true,
           },
@@ -379,6 +382,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice", title: "中标价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -386,6 +390,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice", title: "单价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -393,6 +398,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit", title: "利润比1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -405,6 +411,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice1", title: "中标价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -412,6 +419,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice1", title: "单价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -419,6 +427,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit1", title: "利润比2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -431,6 +440,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice2", title: "中标价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -438,6 +448,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice2", title: "单价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -445,6 +456,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit2", title: "利润比3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/add/index.vue

@@ -152,6 +152,7 @@
         const {TabColumns, TableColumns} = useColumns();
         this.visible = false;
         this.params = this.$init.params([...TabColumns, ...TableColumns]);
+        this.$emit("success");
       },
       //
       async onRowAdd(prop, pushParams = {}) {
@@ -253,7 +254,7 @@
           :name="item.key"
           lazy
         >
-          <div v-loading="loading" style="height: 600px; display: flex">
+          <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-table
               v-model="params[item.key]"
               :dict="dict"

src/views/purchase/apply/copy/columns.js

@@ -169,6 +169,7 @@ export default function useColumns() {
           item: { key: "conversionRate", title: "采购换算率", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             value: 1,
             disabled: true,
@@ -188,6 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -255,6 +257,7 @@ export default function useColumns() {
           item: { key: "recentlyPrice", title: "最近价格" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             disabled: true,
           },
@@ -380,6 +383,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice", title: "中标价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -387,6 +391,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice", title: "单价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -394,6 +399,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit", title: "利润比1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -406,6 +412,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice1", title: "中标价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -413,6 +420,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice1", title: "单价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -420,6 +428,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit1", title: "利润比2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -432,6 +441,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice2", title: "中标价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -439,6 +449,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice2", title: "单价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -446,6 +457,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit2", title: "利润比3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/copy/index.vue

@@ -203,6 +203,7 @@ export default {
       const { TabColumns, TableColumns } = useColumns();
       this.visible = false;
       this.params = this.$init.params([...TabColumns, ...TableColumns]);
+      this.$emit("success");
     },
     //
     async onRowAdd(prop, pushParams = {}) {
@@ -308,7 +309,7 @@ export default {
           :name="item.key"
           lazy
         >
-          <div v-loading="loading" style="height: 600px; display: flex">
+          <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-table
               v-model="params[item.key]"
               :dict="dict"

src/views/purchase/apply/edit/columns.js

@@ -169,6 +169,7 @@ export default function useColumns() {
           item: { key: "conversionRate", title: "采购换算率", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             value: 1,
             disabled: true,
@@ -188,6 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -255,6 +257,7 @@ export default function useColumns() {
           item: { key: "recentlyPrice", title: "最近价格" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             disabled: true,
           },
@@ -380,6 +383,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice", title: "中标价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -387,6 +391,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice", title: "单价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -394,6 +399,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit", title: "利润比1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -406,6 +412,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice1", title: "中标价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -413,6 +420,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice1", title: "单价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -420,6 +428,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit1", title: "利润比2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -432,6 +441,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice2", title: "中标价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -439,6 +449,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice2", title: "单价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -446,6 +457,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit2", title: "利润比3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/edit/index.vue

@@ -153,7 +153,6 @@
             updateByName: createByName,
             id: null,
           });
-          console.log('isPriceAdjustment', isPriceAdjustment)
         }
       },
       // 
@@ -215,6 +214,7 @@
         const {TabColumns, TableColumns} = useColumns();
         this.visible = false;
         this.params = this.$init.params([...TabColumns, ...TableColumns]);
+        this.$emit("success");
       },
       //
       async onRowAdd(prop, pushParams = {}) {
@@ -330,7 +330,7 @@
           :name="item.key"
           lazy
         >
-          <div v-loading="loading" style="height: 600px; display: flex">
+          <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-table
               v-model="priceApply[item.key]"
               :dict="dict"

src/views/purchase/apply/see/index.vue

@@ -91,6 +91,7 @@ export default {
     },
     //
     async hide() {
+      console.log("关闭！！！！！！！", this.$props)
       const {
         TabColumns: [
           {
@@ -100,6 +101,7 @@ export default {
       } = useColumns();
       this.visible = false;
       this.tabName = tabName;
+      this.$emit("success");
     },
     async jumpOA() {
       toOA(this.$store.state.user.name, this.params.flowId).then(res => {

src/views/purchase/catalogue/columns.js

@@ -92,6 +92,7 @@ export default function useColumns() {
       item: { width: 100, key: "puOrgName", title: "采购组织" },
       attr: {
         is: "el-popover-select-v2",
+        clearable: true,
         referName: "ORG_PARAM",
         valueKey: "name",
         dataMapping: {
@@ -104,6 +105,7 @@ export default function useColumns() {
       item: { width: 100, key: "manufacturerName", title: "生产厂家" },
       attr: {
         is: "el-popover-select-v2",
+        clearable: true,
         referName: "MANUFACTURER_PARAM",
         valueKey: "name",
         dataMapping: {
@@ -116,6 +118,7 @@ export default function useColumns() {
       item: { width: 100, key: "supplierName", title: "供应商" },
       attr: {
         is: "el-popover-select-v2",
+        clearable: true,
         referName: "SUPPLIER_PARAM",
         valueKey: "name",
         dataMapping: {
@@ -126,7 +129,7 @@ export default function useColumns() {
     },
     {
       item: { width: 100, key: "applyCode", title: "来源单据" },
-      attr: { is: "el-input" },
+      attr: { clearable: true, is: "el-input" },
     },
     {
       item: {key: "materialCodeList", title: "物料编码"},
@@ -156,6 +159,7 @@ export default function useColumns() {
     {
       item: { key: "materialClassifyList", title: "物料一级分类"},
       attr: {
+        clearable: true,
         is: "el-popover-multiple-tree-select",
         referName: "MATERIALCLASSIFY_PARAM",
         valueKey: "code",
@@ -163,19 +167,20 @@ export default function useColumns() {
     },
     {
       item: { width: 100, key: "source", title: "价格来源" },
-      attr: { is: "el-select", dictName: "price_source" },
+      attr: { clearable: true, is: "el-select", dictName: "price_source" },
     },
     {
       item: { width: 100, key: "status", title: "有效状态" },
-      attr: { is: "el-select", dictName: "price_invalid" },
+      attr: { clearable: true, is: "el-select", dictName: "price_invalid" },
     },
     {
       item: { width: 100, key: "enableStatus", title: "启用状态", span: 4 },
-      attr: { is: "el-select", dictName: "price_enable" },
+      attr: { clearable: true, is: "el-select", dictName: "price_enable" },
     },
     {
       item: { width: 100, key: "createTime", title: "价格日期", span: 8 },
       attr: {
+        clearable: true,
         is: "el-date-picker",
         type: "datetimerange",
         rangeSeparator: "至",
@@ -187,6 +192,7 @@ export default function useColumns() {
     {
       item: { width: 100, key: "invalid", title: "价格失效日期", span: 8 },
       attr: {
+        clearable: true,
         is: "el-date-picker",
         type: "datetimerange",
         rangeSeparator: "至",

src/views/purchase/purchase-order/add/index.vue

@@ -388,37 +388,37 @@ export default {
         
       }
 
-      // 组织
-      if(type === 'ORG_PARAM'){
-
-          for (const key in this.params) {
-
-            // if (Array.isArray(this.params[key])) {
-            if (key === 'puOrderItemList' || key === 'puOrderExecuteList') {
-
-              this.params[key] = [];
-
-            }
-            else if(key === 'sysFileRecordList'){
-              this.params[key] = [];
-            }
-             else if (
-              key != "puOrg" &&
-              key != "puOrgName" &&
-              key != "buyer" &&
-              key != "buyerName" &&
-              key != "puDept" &&
-              key != "puDeptName" &&
-              key != "status" &&
-              key != "billDate" 
-            ) {
-              this.params[key] = "";
-            } else {
-            }
-          }
+      // // 组织
+      // if(type === 'ORG_PARAM'){
+
+      //     for (const key in this.params) {
+
+      //       // if (Array.isArray(this.params[key])) {
+      //       if (key === 'puOrderItemList' || key === 'puOrderExecuteList') {
+
+      //         this.params[key] = [];
+
+      //       }
+      //       else if(key === 'sysFileRecordList'){
+      //         this.params[key] = [];
+      //       }
+      //        else if (
+      //         key != "puOrg" &&
+      //         key != "puOrgName" &&
+      //         key != "buyer" &&
+      //         key != "buyerName" &&
+      //         key != "puDept" &&
+      //         key != "puDeptName" &&
+      //         key != "status" &&
+      //         key != "billDate" 
+      //       ) {
+      //         this.params[key] = "";
+      //       } else {
+      //       }
+      //     }
         
 
-      }
+      // }
     },
 
     // 下拉框选择改变
@@ -715,6 +715,7 @@ export default {
                 :clearable="column.clearable"
                 :placeholder="column.placeholder"
                 style="width: 100%"
+                filterable
                 @change="handleSelectChange(column.key,column.referName)"
               >
                 <el-option
@@ -865,7 +866,7 @@ export default {
                     <el-select
                       v-if="cColumn.inputType === 'Select'"
                       v-model="scope.row[cColumn.key]"
-                      
+                      filterable
                       size="mini"
                       :disabled="cColumn.disabled"
                       :clearable="cColumn.clearable"

src/views/purchase/purchase-order/index.vue

@@ -63,7 +63,7 @@ export default {
     },
   },
   created() {
-    this.params.orderCode = this.$route.query.billCode
+    if(this.$route.query.billCode) this.params.orderCode = this.$route.query.billCode 
     this.fetchList(this.params, this.page);
     // this.handleRefreshList();
   },