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

src/components/FileUpload/index.vue

@@ -84,7 +84,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf",'png', 'jpg', 'jpeg'],
+      default: () => ["doc", "xls", "ppt", "txt", "pdf",'png', 'jpg', 'jpeg','docx','xlsx','pptx'],
     },
     // 是否显示提示
     isShowTip: {

src/views/login.vue

@@ -23,7 +23,7 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
+      <!-- <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -36,7 +36,7 @@
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
@@ -89,7 +89,7 @@ export default {
       },
       loading: false,
       // 验证码开关
-      captchaEnabled: true,
+      captchaEnabled: false,
       // 注册开关
       register: false,
       redirect: undefined

src/views/material/classify/index.vue

@@ -1,29 +1,22 @@
 <template>
   <div class="classify">
-    <el-row :gutter="10" class="mb10">
-      <el-col :span="1.5">
-        <el-button type="primary" size="small" plain @click="addClassify"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" size="small" plain @click="editClassify"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" size="small" plain @click="deleteClassify"
-          >删除</el-button
-        >
-      </el-col>
-    </el-row>
 
     <el-card v-loading="loading">
+
+      <el-row :gutter="10" class="mb10">
+        <div>
+          <el-button type="primary" size="mini" plain @click="addClassify">新增</el-button>
+          <el-button type="primary" size="mini" plain @click="editClassify">修改</el-button>
+          <el-button type="primary" size="mini" plain @click="refreshData">{{refreshName ? '全部分类': '过滤停用'}}</el-button>
+          <el-button type="primary" size="mini" plain @click="deleteClassify">删除</el-button>
+        </div>
+      </el-row>
+
       <el-row :gutter="10" class="content">
         <el-col :span="6">
           <el-input
-            placeholder="输入关键字进行过滤"
-            size="small"
+            placeholder="输入关键字/编码进行过滤"
+            size="mini"
             v-model="filterText"
           >
           </el-input>
@@ -60,6 +53,7 @@
                   <el-input
                     :disabled="disable"
                     v-model="ruleForm.code"
+                    size="mini"
                   ></el-input>
                   <span>编码规则x-xxx-xxx-xxx</span>
                 </el-form-item>
@@ -69,6 +63,7 @@
                   <el-input
                     :disabled="disable"
                     v-model="ruleForm.materialType"
+                    size="mini"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -80,6 +75,7 @@
                     v-model="ruleForm.isEnable"
                     placeholder="启用状态"
                     clearable
+                    size="mini"
                     :disabled="disable"
                     style="width: 230px"
                   >
@@ -102,6 +98,7 @@
                     placeholder="属性结构"
                     clearable
                     :disabled="disable"
+                    size="mini"
                     style="width: 230px"
                   >
                     <el-option
@@ -210,6 +207,8 @@ export default {
       // 判断是新增还是修改
       isAdd: true,
       defaultExpanded: [],
+      // 是否过滤停用
+      refreshName: false
     };
   },
   watch: {
@@ -224,10 +223,9 @@ export default {
   mounted() {},
   methods: {
     // 获取树形结构
-    getTreeData(data) {
+    getTreeData(isEnable) {
       this.loading = true;
-      getTree({})
-        .then((res) => {
+      getTree({}).then((res) => {
           let { code, rows } = res;
           if (code === 200) {
             this.data = rows;
@@ -252,7 +250,7 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return data.materialType.indexOf(value) !== -1;
+      return data.materialType.indexOf(value) !== -1 || data.code.indexOf(value) !== -1;
     },
     clickTree(data, node) {
       console.log("data", data, node);
@@ -389,6 +387,25 @@ export default {
         this.isAdd = false;
       }
     },
+    // 启用停用
+    refreshData() {
+      if(this.refreshName == false) {
+        this.refreshName = true
+        this.loading = true;
+        getTree({isEnable: '0'}).then((res) => {
+          let { code, rows } = res;
+          if (code === 200) {
+            this.data = rows;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+      } else {
+        this.refreshName = false
+        this.getTreeData();
+      }
+    },
   },
 };
 </script>
@@ -403,4 +420,8 @@ export default {
 .title {
   font-weight: bold;
 }
+.mb10 {
+  display: flex;
+  flex-direction: row-reverse;
+}
 </style>

src/views/material/requisition/add.vue

@@ -1273,6 +1273,8 @@
 
               this.basicForm.id = '';
 
+              this.basicForm.code = '';
+
               this.basicForm.billCode = '';
 
               this.basicForm.diCode = '';
@@ -1343,7 +1345,8 @@
           if (!this.basicForm.proposerId) {
             this.basicForm.proposerId = this.$store.state.user.name
           }
-          let sparams = {...this.basicForm, ...{status: 0}}
+          // let sparams = {...this.basicForm, ...{status: 0}}
+          let sparams = {...this.basicForm,}
           sparams.sysMaterialMedcineApply = this.basicForm2
           sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
           console.log('提交参数', sparams)

src/views/material/requisition/index.vue

@@ -213,7 +213,7 @@
       async handleBatchSubmit(){
           let filterList = this.checkedList.filter(item => !(item.status === '0' || item.status === '3') )
           
-          console.log(filterList,'filterList');
+          console.log(filterList,'filterList',this.checkedList.length);
 
           if(!filterList.length &&  this.checkedList.length){  
 
@@ -388,7 +388,7 @@
             this.pageStatus.total = res.total;
           }
         })
-        this.checkedList = [];
+        // this.checkedList = [];
       },
       // 表格内状态栏判断值
       statusJug(row) {

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

@@ -109,6 +109,7 @@ export default {
     },
     //
     async changePaymentAgreement(prop) {
+      console.log('合同参数', prop)
       const {
         selectData: { code },
       } = prop;

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

@@ -59,7 +59,8 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf", "jpg", "png"],
+      default: () => ["doc", "xls", "ppt", "txt", "pdf",'png', 'jpg', 'jpeg','docx','xlsx','pptx'],
+      
     },
     // 是否显示提示
     isShowTip: {

src/views/purchase/task/xie-yi-zhi-cai/column.js

@@ -19,29 +19,26 @@ export const TableColumns = [
      
     },
   },
-  {
-    item: { key: "demandDate", title: "需求时间" },
-    attr: {},
-  },
+  
   
   // {
   //   item: { key: "customerName", title: "客户" },
   //   attr: {},
   // },
   {
-    item: { key: "priceType", title: "价格类型" },
+    item: { key: "priceType", title: "价格类型" ,width:145},
     attr: { is: "el-dict-tag", dictName: "sys_price_type" },
   },
   {
-    item: { key: "effectiveDate", title: "价格生效日期" },
+    item: { key: "effectiveDate", title: "价格生效日期",width:160 },
     attr: {},
   },
   {
-    item: { key: "endDate", title: "价格失效日期" },
+    item: { key: "endDate", title: "价格失效日期" ,width:160},
     attr: {},
   },
   {
-    item: { key: "tax", title: "税率 (%)" },
+    item: { key: "tax", title: "税率 (%)" ,width:120},
     attr: {
       is: "el-computed-input-v2",
       formatter: (prop) => {
@@ -50,7 +47,7 @@ export const TableColumns = [
     },
   },
   {
-    item: { key: "taxFreePrice", title: "无税单价" },
+    item: { key: "taxFreePrice", title: "无税单价" ,width:150},
     attr: {
       is: "el-computed-input-v2",
       formatter: (prop) => {
@@ -59,7 +56,7 @@ export const TableColumns = [
     },
   },
   {
-    item: { key: "taxPrice", title: "主含税单价" },
+    item: { key: "taxPrice", title: "主含税单价",width:150 },
     attr: {
       is: "el-computed-input-v2",
       formatter: (prop) => {
@@ -122,5 +119,9 @@ export const BasicColumns = [
     item: { key: "customerName", title: "需求客户" },
     attr: {},
   },
+  {
+    item: { key: "demandDate", title: "需求时间" },
+    attr: {},
+  },
  
 ]