Ver Fonte

1.【价格申报单】调整按钮UI样式
2.【价格目录】调整按钮UI样式
3.【采购需求处理】调整按钮UI样式,规划整体组件规格mini
4.【调拨订单】调整按钮、表单UI优化
以上均不涉及功能

002390 há 1 ano atrás
pai
commit
933b1a873e

+ 44 - 46
src/views/purchase/DemandSummary/add.vue

@@ -3,33 +3,28 @@
     <el-card style="position: relative">
       <span>采购需求处理详情</span>
       <div class="btn_grooup">
-        <el-button type="primary" size="mini" @click="editLine">编辑</el-button>
+        <el-button type="primary" :size="size" @click="editLine"
+          >编辑</el-button
+        >
         <el-button
           type="danger"
-          size="mini"
+          :size="size"
           v-if="!lineDisable"
           @click="cancelEdit"
           >取消编辑</el-button
         >
         <el-button
           type="success"
-          size="mini"
+          :size="size"
           v-if="!lineDisable"
           @click="saveLine"
-          >保存</el-button
-        >
-        <el-button
-          type="primary"
-          size="mini"
+          :size="size"
           v-if="lineDisable"
+          :disabled="ids.length == 0"
           @click="closeLine"
           >行关闭</el-button
         >
-        <el-button
-          type="primary"
-          size="mini"
-          v-if="lineDisable"
-          @click="reloadBatch"
+        <el-button :size="size" v-if="lineDisable" @click="reloadBatch"
           >重取批量</el-button
         >
       </div>
@@ -61,7 +56,7 @@
             <el-input
               clearable
               :disabled="scope.row.status !== '1' || lineDisable"
-              size="mini"
+              :size="size"
               v-model="scope.row.orgName"
               @clear="clean(scope.row, '默认采购组织')"
               @focus="
@@ -69,7 +64,7 @@
               "
             >
               <el-button
-                size="mini"
+                :size="size"
                 :disabled="scope.row.status !== '1' || lineDisable"
                 slot="append"
                 icon="el-icon-more"
@@ -171,7 +166,7 @@
               clearable
               type="number"
               min="0"
-              size="mini"
+              :size="size"
               :disabled="scope.row.status !== '1' || lineDisable"
               v-model="scope.row.puQtyRes"
             />
@@ -245,7 +240,7 @@
           <template slot-scope="scope">
             <el-input
               clearable
-              size="mini"
+              :size="size"
               :disabled="scope.row.status !== '1' || lineDisable"
               v-model="scope.row.updateCause"
             />
@@ -320,7 +315,7 @@
             <el-input
               clearable
               :disabled="scope.row.isReplenishment == 'N' || lineDisable"
-              size="mini"
+              :size="size"
               v-model="scope.row.additionalSupplierName"
               @clear="clean(scope.row, '选择补单供应商')"
               @focus="
@@ -333,7 +328,7 @@
               "
             >
               <el-button
-                size="mini"
+                :size="size"
                 :disabled="scope.row.isReplenishment == 'N' || lineDisable"
                 slot="append"
                 icon="el-icon-more"
@@ -390,7 +385,7 @@
             <el-input
               clearable
               :disabled="scope.row.status !== '1' || lineDisable"
-              size="mini"
+              :size="size"
               v-model="scope.row.deliveryWarehouseName"
               @clear="clean(scope.row, '收货仓库')"
               @focus="
@@ -404,7 +399,7 @@
               "
             >
               <el-button
-                size="mini"
+                :size="size"
                 :disabled="scope.row.status !== '1' || lineDisable"
                 slot="append"
                 icon="el-icon-more"
@@ -432,7 +427,7 @@
             <el-input
               clearable
               :disabled="scope.row.status !== '1' || lineDisable"
-              size="mini"
+              :size="size"
               v-model="scope.row.deliveryAllocationName"
               @clear="clean(scope.row, '收货货位')"
               @focus="
@@ -446,7 +441,7 @@
               "
             >
               <el-button
-                size="mini"
+                :size="size"
                 :disabled="scope.row.status !== '1' || lineDisable"
                 slot="append"
                 icon="el-icon-more"
@@ -477,7 +472,13 @@
           prop="billMaker"
           width="100"
         />
-        <!-- <el-table-column show-overflow-tooltip label="审核人员" align="center" prop="approver" width="100"/> -->
+        <el-table-column
+          show-overflow-tooltip
+          label="审核人员"
+          align="center"
+          prop="approver"
+          width="100"
+        />
         <!-- <el-table-column show-overflow-tooltip label="请购单号" align="center" prop="code"/> -->
         <el-table-column
           show-overflow-tooltip
@@ -534,7 +535,7 @@
             <el-input
               clearable
               :disabled="scope.row.status !== '1' || lineDisable"
-              size="mini"
+              :size="size"
               v-model="scope.row.demandDeptName"
               @clear="clean(scope.row, '需求部门')"
               @focus="
@@ -548,7 +549,7 @@
               "
             >
               <el-button
-                size="mini"
+                :size="size"
                 :disabled="scope.row.status !== '1' || lineDisable"
                 slot="append"
                 icon="el-icon-more"
@@ -649,7 +650,7 @@
 
       <div class="btn_group">
         <el-col :span="1.5">
-          <el-button size="mini" plain @click="back" v-if="lineDisable"
+          <el-button :size="size" @click="back" v-if="lineDisable"
             >返回</el-button
           >
         </el-col>
@@ -680,6 +681,7 @@ export default {
   },
   data() {
     return {
+      size: "mini",
       loading: true,
       hangStatus(row) {
         switch (row.status) {
@@ -812,25 +814,21 @@ export default {
     },
     // 行关闭
     closeLine() {
-      if (this.ids.length == 0) {
-        this.$modal.notifyWarning("请选中至少一条数据");
-      } else {
-        this.$modal
-          .confirm("是否确定关闭?")
-          .then(function () {})
-          .then(() => {
-            let param = this.ids.join();
-            shutDownSummary(param).then((res) => {
-              if (res.code === 200) {
-                this.$modal.notifySuccess("操作成功");
-                let param = JSON.parse(JSON.stringify(this.query));
-                param.sumFlag = this.row.sumFlag;
-                this.getDetails(param);
-              }
-            });
-          })
-          .catch(() => {});
-      }
+      this.$modal
+        .confirm("是否确定关闭?")
+        .then(function () {})
+        .then(() => {
+          let param = this.ids.join();
+          shutDownSummary(param).then((res) => {
+            if (res.code === 200) {
+              this.$modal.notifySuccess("操作成功");
+              let param = JSON.parse(JSON.stringify(this.query));
+              param.sumFlag = this.row.sumFlag;
+              this.getDetails(param);
+            }
+          });
+        })
+        .catch(() => {});
     },
     // 重取批量
     reloadBatch() {

+ 39 - 66
src/views/purchase/DemandSummary/index.vue

@@ -428,34 +428,34 @@
             :size="size"
             v-if="lineDisable"
             @click="confirms"
+            :disabled="ids.length == 0"
             >确认</el-button
           >
           <el-button
-            type="primary"
             :size="size"
             v-if="lineDisable"
+            :disabled="ids.length == 0"
             @click="cancels"
             >取消</el-button
           >
           <!-- <el-button type="primary" :size="size" v-if="lineDisable" @click="cancelAudit">取消审批</el-button> -->
           <el-button
-            type="primary"
             :size="size"
             v-if="lineDisable"
+            :disabled="ids.length == 0"
             @click="audits"
             >审核</el-button
           >
           <el-button
-            type="primary"
             :size="size"
             v-if="lineDisable"
+            :disabled="ids.length == 0"
             @click="closeLine"
             >行关闭</el-button
           >
 
           <el-button
             :size="size"
-            type="primary"
             style="margin: 0 10px"
             v-if="lineDisable"
             @click="handleCommand"
@@ -1394,7 +1394,6 @@ export default {
       this.expanded = !this.expanded;
     },
     editList() {
-      console.log("Lists`````", this.tableList);
       this.lineDisable = false;
     },
     cancelEdit() {
@@ -1402,14 +1401,11 @@ export default {
       this.getList(this.queryParams);
     },
     saveList() {
-      // console.log("记录", this.record);
       // 对记录的数据进行去重
       let newRecord = Array.from(new Set(this.record));
-      // console.log("去重后的", newRecord);
       let changeList = newRecord.map((i) => {
         return this.tableList[i];
       });
-      // console.log('shuzu', changeList)
       editSummaryList(changeList).then((res) => {
         if (res.code === 200) {
           this.record = [];
@@ -1420,29 +1416,21 @@ export default {
       });
     },
     confirms() {
-      if (this.ids.length == 0) {
-        this.$modal.notifyWarning("请选中至少一条数据");
-      } else {
-        confirmSummary(this.allSelection).then((res) => {
-          if (res.code === 200) {
-            this.$modal.notifySuccess("确认成功");
-            this.getList(this.queryParams);
-          }
-        });
-      }
+      confirmSummary(this.allSelection).then((res) => {
+        if (res.code === 200) {
+          this.$modal.notifySuccess("确认成功");
+          this.getList(this.queryParams);
+        }
+      });
     },
     cancels() {
-      if (this.ids.length == 0) {
-        this.$modal.notifyWarning("请选中至少一条数据");
-      } else {
-        let param = this.ids.join();
-        cancelSummary(param).then((res) => {
-          if (res.code === 200) {
-            this.$modal.notifySuccess("取消成功");
-            this.getList(this.queryParams);
-          }
-        });
-      }
+      let param = this.ids.join();
+      cancelSummary(param).then((res) => {
+        if (res.code === 200) {
+          this.$modal.notifySuccess("取消成功");
+          this.getList(this.queryParams);
+        }
+      });
     },
     cancelAudit() {
       if (this.ids.length == 0) {
@@ -1458,21 +1446,17 @@ export default {
       }
     },
     audits() {
-      if (this.ids.length == 0) {
-        this.$modal.notifyWarning("请选中至少一条数据");
-      } else {
-        let param = this.ids.join();
-        auditSummary(param)
-          .then((res) => {
-            if (res.code === 200) {
-              this.$modal.notifySuccess("审核成功");
-              this.getList(this.queryParams);
-            }
-          })
-          .catch((err) => {
+      let param = this.ids.join();
+      auditSummary(param)
+        .then((res) => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("审核成功");
             this.getList(this.queryParams);
-          });
-      }
+          }
+        })
+        .catch((err) => {
+          this.getList(this.queryParams);
+        });
     },
     // 行关闭
     closeitem() {
@@ -1485,24 +1469,19 @@ export default {
       });
     },
     closeLine() {
-      if (this.ids.length == 0) {
-        this.$modal.notifyWarning("请选中至少一条数据");
+      let item = this.allSelection.some((item) => {
+        return item.demandNum >= 2;
+      });
+      if (item) {
+        this.$modal
+          .confirm("选中项有多个需求单位,是否确定关闭?")
+          .then(function () {})
+          .then(() => {
+            this.closeitem();
+          })
+          .catch(() => {});
       } else {
-        console.log("选中数组", this.allSelection);
-        let item = this.allSelection.some((item) => {
-          return item.demandNum >= 2;
-        });
-        if (item) {
-          this.$modal
-            .confirm("选中项有多个需求单位,是否确定关闭?")
-            .then(function () {})
-            .then(() => {
-              this.closeitem();
-            })
-            .catch(() => {});
-        } else {
-          this.closeitem();
-        }
+        this.closeitem();
       }
     },
     // 搜索区参照选择
@@ -1544,7 +1523,6 @@ export default {
         this.queryParams.purchaseOrg = selection[0].id;
       }
       if (this.referCondition.title == "明细采购员") {
-        console.log("选择进了吗", this.tableList);
         this.record.push(this.tableIndex);
         this.tableList[this.tableIndex].buyer = selection[0].code;
         this.tableList[this.tableIndex].buyerName = selection[0].name;
@@ -1577,11 +1555,9 @@ export default {
       this.$refs.materialRefer.init();
     },
     selectMaterial(selection) {
-      console.log("选择的物料", selection);
       this.queryParams.materialCodeList = selection.map((item) => {
         return item.code;
       });
-      console.log(this.queryParams.materialCodeList);
       this.queryParams.names = selection
         .map((item) => {
           return item.name;
@@ -1598,7 +1574,6 @@ export default {
       this.$modal.loading("正在粘贴数据...");
       e.preventDefault(); //阻止默认粘贴事件
       let source = e.clipboardData.getData("Text");
-      console.log("source", source);
       // 这里区分普通复制和在表格内复制,判断是否包含','
       // 没找到,就通过表格复制
       if (source.indexOf(",") === -1) {
@@ -1613,7 +1588,6 @@ export default {
             this.$modal.closeLoading();
             if (res.code === 200) {
               let rowList = res.rows;
-              console.log("粘贴的", rowList);
               this.queryParams.materialCodeList = rowList.map((item) => {
                 return item.code;
               });
@@ -1630,7 +1604,6 @@ export default {
       } else {
         // 找到了,按,分割
         let codelist = source.split(",");
-        console.log("按照逗号分隔", codelist);
         // 数组去除空字符串
         codelist = codelist.filter((item) => {
           return item && item.trim();

+ 2 - 2
src/views/purchase/PurchaseDemandList/index.vue

@@ -30,7 +30,7 @@
           </el-dropdown>
 
           <el-dropdown :size="size" @command="handleExport">
-            <el-button :size="size" type="primary" style="margin: 0 10px">
+            <el-button :size="size" style="margin: 0 10px">
               导出<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
@@ -39,7 +39,7 @@
             </el-dropdown-menu>
           </el-dropdown>
 
-          <el-button type="primary" :size="size" @click="delItems"
+          <el-button :size="size" @click="delItems"
             >删除</el-button
           >
         </div>

+ 3 - 2
src/views/purchase/apply/index.vue

@@ -253,6 +253,7 @@ export default {
         <add-button
           :size="size"
           :dict="dict"
+          type="primary"
           @success="useQuery(params, page)"
         ></add-button>
         <copy-button
@@ -293,8 +294,8 @@ export default {
         ></subm-button>
       </el-button-group>
       <el-button-group>
-        <el-button size="mini" @click="downLoadMb">模 板</el-button>
-        <el-button size="mini" @click="importMb">导 入</el-button>
+        <el-button :size="size" @click="downLoadMb">模 板</el-button>
+        <el-button :size="size" type="primary" @click="importMb">导 入</el-button>
       </el-button-group>
     </el-row>
     <el-super-ux-table

+ 1 - 0
src/views/purchase/catalogue/index.vue

@@ -145,6 +145,7 @@ export default {
           :size="size"
           :select-data="selectData"
           status="Y"
+          type="primary"
           @success="useQuery(params, page)"
         ></ena-button>
         <!-- <ena-button

Diff do ficheiro suprimidas por serem muito extensas
+ 381 - 174
src/views/purchase/transferOrder/add.vue


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff