修改页面部分显示

2 years ago · 3b4db2e238
7 changed files with 79 additions and 40 deletions
--- a/src/views/description/ProcessDescriptionList.vue
+++ b/src/views/description/ProcessDescriptionList.vue
@ -14,21 +14,25 @@
              <a-input placeholder="请输入品名名称" v-model="queryParam.descriptionName"></a-input>
            </a-form-item>
          </a-col>
-          <template v-if="toggleSearchStatus">
+
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="分类名称">
-                <a-input placeholder="请输入分类名称" v-model="queryParam.classifyName"></a-input>
+<!--                <a-input placeholder="请输入分类名称" v-model="queryParam.classifyName"></a-input>-->
+                <a-select v-model="queryParam.bigCategoryId" placeholder="请选择" >
+                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.categoryName}}</a-select-option>
+                </a-select>
              </a-form-item>
            </a-col>
+          <template v-if="toggleSearchStatus">
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
            </span>
          </a-col>
        </a-row>
@ -127,6 +131,7 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import ProcessDescriptionModal from './modules/ProcessDescriptionModal'
  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { getAction } from '@api/manage'

  export default {
    name: 'ProcessDescriptionList',
@ -138,6 +143,7 @@
    data () {
      return {
        description: '品名分类管理页面',
+        bigId:[],
        // 表头
        columns: [
          {
@ -163,7 +169,7 @@
          {
            title:'分类名称',
            align:"center",
-            dataIndex: 'classifyName'
+            dataIndex: 'bigCategoryId'
          },
          {
            title: '操作',
@ -180,7 +186,7 @@
          deleteBatch: "/description/processDescription/deleteBatch",
          exportXlsUrl: "/description/processDescription/exportXls",
          importExcelUrl: "description/processDescription/importExcel",
-
+          categoryId: "/bigcategory/processBigCategory/list"
        },
        dictOptions:{},
        superFieldList:[],
@ -201,8 +207,20 @@
        let fieldList=[];
        fieldList.push({type:'string',value:'materialClassify',text:'物料分类编号',dictCode:''})
        fieldList.push({type:'string',value:'descriptionName',text:'品名名称',dictCode:''})
-        fieldList.push({type:'string',value:'classifyName',text:'分类名称',dictCode:''})
-        this.superFieldList = fieldList
+        fieldList.push({type:'string',value:'bigCategoryId',text:'分类名称',dictCode:''})
+        this.superFieldList = fieldList;
+        //查询大品类数据
+        let par = {
+          classify: 1,
+          delFlag: 0,
+          state: 0
+        }
+        getAction(this.url.categoryId,par).then((res)=>{
+          if(res.success){
+            // console.log(res.result.records);
+            this.bigId = res.result.records;
+          }
+        });
      }
    }
  }
--- a/src/views/description/modules/ProcessDescriptionForm.vue
+++ b/src/views/description/modules/ProcessDescriptionForm.vue
@ -15,7 +15,11 @@
          </a-col>
          <a-col :span="8">
            <a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['classifyName']" placeholder="请输入分类名称"  ></a-input>
+<!--              <a-input v-decorator="['classifyName']" placeholder="请输入分类名称"  ></a-input>-->
+<!--              <j-dict-select-tag type="list" v-decorator="['classifyName']" :trigger-change="true" dictCode="hardware_category" placeholder="请输入分类" />-->
+              <a-select v-decorator="['bigCategoryId']" placeholder="请选择" >
+                <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.categoryName}}</a-select-option>
+              </a-select>
            </a-form-item>
          </a-col>
          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
@ -74,10 +78,13 @@
        confirmLoading: false,
        validatorRules: {
        },
+        bigId:[],
+        yunName:'',
        url: {
          add: "/description/processDescription/add",
          edit: "/description/processDescription/edit",
-          queryById: "/description/processDescription/queryById"
+          queryById: "/description/processDescription/queryById",
+          categoryId: "/bigcategory/processBigCategory/list"
        }
      }
    },
@ -113,7 +120,7 @@
        this.model = Object.assign({}, record);
        this.visible = true;
        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'materialClassify','descriptionName','classifyName'))
+          this.form.setFieldsValue(pick(this.model,'materialClassify','descriptionName','bigCategoryId'))
        })
      },
      //渲染流程表单数据
@ -126,6 +133,18 @@
            }
          });
        }
+        //查询大品类数据
+        let par = {
+          classify: 1,
+          delFlag: 0,
+          state: 0
+        }
+        getAction(this.url.categoryId,par).then((res)=>{
+          if(res.success){
+            // console.log(res.result.records);
+            this.bigId = res.result.records;
+          }
+        });
      },
      submitForm () {
        const that = this;
@ -144,6 +163,10 @@
            }
            let formData = Object.assign(this.model, values);
            console.log("表单提交数据",formData)
+            if(method === 'post'){
+              // formData.classifyName = '';
+              formData.delFlag = 0;
+            }
            httpAction(httpurl,formData,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
@ -155,7 +178,7 @@
              that.confirmLoading = false;
            })
          }
-         
+
        })
      },
      popupCallback(row){
--- a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
+++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
@ -151,7 +151,7 @@
        // 表头
        columns: [
          {
-            title: '#',
+            title: '序号',
            dataIndex: '',
            key:'rowIndex',
            width:60,
@ -166,7 +166,7 @@
            dataIndex: 'merchandiseName'
          },
          {
-            title:'供应商ID',
+            title:'供应商',
            align:"center",
            dataIndex: 'supplierId'
          },
@ -176,7 +176,7 @@
            dataIndex: 'partyNumber'
          },
          {
-            title:'品名编号ID',
+            title:'品名分类',
            align:"center",
            dataIndex: 'descriptionId'
          },
@ -225,7 +225,7 @@
          deleteBatch: "/merchandisenews/processMerchandiseNews/deleteBatch",
          exportXlsUrl: "/merchandisenews/processMerchandiseNews/exportXls",
          importExcelUrl: "merchandisenews/processMerchandiseNews/importExcel",
-          
+
        },
        dictOptions:{},
        superFieldList:[],
--- a/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue
+++ b/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue
@ -9,7 +9,7 @@
            </a-form-item>
          </a-col>
          <a-col :span="8">
-            <a-form-item label="供应商ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input v-decorator="['supplierId']" placeholder="请输入供应商ID"  ></a-input>
            </a-form-item>
          </a-col>
@ -19,7 +19,7 @@
            </a-form-item>
          </a-col>
          <a-col :span="8">
-            <a-form-item label="品名编号ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="品名分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input v-decorator="['descriptionId']" placeholder="请输入品名编号ID"  ></a-input>
            </a-form-item>
          </a-col>
@ -190,7 +190,7 @@
              that.confirmLoading = false;
            })
          }
-         
+
        })
      },
      popupCallback(row){
--- a/src/views/supplier/ProcessSupplierList.vue
+++ b/src/views/supplier/ProcessSupplierList.vue
@ -115,9 +115,7 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import ProcessSupplierModal from './modules/ProcessSupplierModal'
  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
-  import { message } from 'ant-design-vue';
-  import { UploadOutlined } from '@ant-design/icons-vue';
-  import { defineComponent, ref } from 'vue';
+


  export default {
@ -126,7 +124,6 @@
    components: {
      ProcessSupplierModal,
      JSuperQuery,
-      UploadOutlined,
    },
    data () {
      return {
--- a/src/views/supplier/modules/ProcessSupplierForm.vue
+++ b/src/views/supplier/modules/ProcessSupplierForm.vue
@ -130,19 +130,19 @@
        this.form.resetFields();
        this.model = Object.assign({}, record);
        this.visible = true;
-        if(dis){
-          if(record.state === 0){
-            record.state = "正常";
-          }else{
-            record.state = "停用"
-          }
-          if(record.rank === 0){
-            record.rank = "一级物资供应商";
-          }else{
-            record.rank = "非集中采购物资供应商"
-          }
-        }
        this.$nextTick(() => {
+          if(dis){
+            if(this.model.state === 0){
+              this.model.state = "正常";
+            }else{
+              this.model.state = "停用"
+            }
+            if(this.model.rank === 0){
+              this.model.rank = "一级物资供应商";
+            }else{
+              this.model.rank = "非集中采购物资供应商"
+            }
+          }
          this.form.setFieldsValue(pick(this.model,'coding','supplierName','rank','state','delFlag'))
        })
      },
--- a/src/views/supplier/modules/ProcessSupplierModal.vue
+++ b/src/views/supplier/modules/ProcessSupplierModal.vue
@ -6,7 +6,7 @@
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
+    @cancel="handleCancel()"
    cancelText="关闭">
    <process-supplier-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-supplier-form>
  </j-modal>
@ -52,8 +52,9 @@
        this.$emit('ok');
        this.visible = false;
      },
-      handleCancel () {
-        this.close()
+      handleCancel (real) {
+        console.log(real);
+        this.close();
      }
    }
  }