Browse Source

Merge branch 'master' of git.echepei.com:wengyuwen/anpinjingyuan-ui

caojunjie 4 năm trước cách đây
mục cha
commit
99a5693cf8

BIN
public/favicon.ico


+ 8 - 0
src/api/warehouse/inStock.js

@@ -173,3 +173,11 @@ export function getWarehousekeeper(query) {
     params: query
   })
 }
+// 查询列宽修改列表
+export function listQuery(query) {
+  return request({
+    url: '/anpin/stockControl/list',
+    method: 'get',
+    params:query
+  })
+}

+ 1 - 0
src/combination/listComponent.vue

@@ -264,6 +264,7 @@ export default {
     },
     //自定义列
     delRow() {
+      console.log(this.listStyle)
       this.data = {
         tableName: this.queryList.tableName,
         userId: Cookies.get("userName"),

+ 1 - 1
src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '若依管理系统',
+  title: '途宝智慧云仓',
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 96 - 37
src/views/basicdata/fees/index.vue

@@ -25,10 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="费用属性" prop="fFeetype">
+      <el-form-item label="物料类别" prop="fFeetype">
         <el-select
           v-model="queryParams.fFeetype"
-          placeholder="请选择费用属性"
+          placeholder="请选择物料类别"
           clearable
           size="small"
         >
@@ -347,10 +347,10 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="费用属性" prop="fFeetype">
+            <el-form-item label="物料类别" prop="fFeetype">
               <el-select
                 v-model="form.fFeetype"
-                placeholder="请选择费用属性"
+                placeholder="请选择物料类别"
                 style="width: 80%"
               >
                 <el-option
@@ -381,38 +381,77 @@
         </el-row>
 
         <el-row>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="状态">-->
+<!--              <el-select-->
+<!--                v-model="form.fStatus"-->
+<!--                placeholder="状态"-->
+<!--                style="width: 80%"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="dict in fDocumentOptions"-->
+<!--                  :key="dict.dictValue"-->
+<!--                  :label="dict.dictLabel"-->
+<!--                  :value="dict.dictValue"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="币种" prop="fCurrency">-->
+<!--              <el-input-->
+<!--                v-model="form.fCurrency"-->
+<!--                placeholder="请输入币种"-->
+<!--                style="width: 80%"-->
+<!--              />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="收付方向">-->
+<!--              <el-select v-model="form.fDc" placeholder="" style="width: 80%">-->
+<!--                <el-option label="收" value="D" />-->
+<!--                <el-option label="付" value="C" />-->
+<!--                <el-option label="收付" value="DC" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="币种" prop="fCurrency">
-              <el-input
-                v-model="form.fCurrency"
-                placeholder="请输入币种"
-                style="width: 80%"
-              />
+            <el-form-item label="税务类别">
+              <el-input v-model="form.fTaxSort" style="width: 80%"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="12">
-            <el-form-item label="状态">
-              <el-select
-                v-model="form.fStatus"
-                placeholder="状态"
-                style="width: 80%"
-              >
-                <el-option
-                  v-for="dict in fDocumentOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
+            <el-form-item label="税务代码">
+              <el-input v-model="form.fTaxCode" placeholder="" style="width: 80%">
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="收付方向">
-              <el-select v-model="form.fDc" placeholder="" style="width: 80%">
-                <el-option label="收" value="D" />
-                <el-option label="付" value="C" />
-                <el-option label="收付" value="DC" />
-              </el-select>
+            <el-form-item label="税率(%)">
+              <el-input v-model="form.fTaxRate" style="width: 80%" oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="含税标识">
+              <el-input v-model="form.fTaxTag" placeholder="" style="width: 80%">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否享受优惠正常" label-width="140px">
+              <template>
+                <el-radio v-model="form.fDiscounts" label="0">是</el-radio>
+                <el-radio v-model="form.fDiscounts" label="1">否</el-radio>
+              </template>
+<!--              <el-input v-model="form.fTaxRate" style="width: 80%"></el-input>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -574,14 +613,14 @@ export default {
         {
           surface: "3",
           label: "fFeetype",
-          name: "费用属性",
+          name: "物料类别",
           checked: 0,
           width: 150,
         },
         {
           surface: "4",
-          label: "fDc",
-          name: "收付方向",
+          label: "fTaxSort",
+          name: "税务类别",
           checked: 0,
           width: 100,
         },
@@ -601,17 +640,36 @@ export default {
         },
         {
           surface: "7",
-          label: "fStatus",
-          name: "状态",
+          label: "fTaxCode",
+          name: "税务代码",
           checked: 0,
           width: 100,
         },
         {
           surface: "8",
+          label: "fTaxRate",
+          name: "税率",
+          checked: 0,
+          width: 100,
+        },{
+          surface: "9",
+          label: "fTaxTag",
+          name: "含税标识",
+          checked: 0,
+          width: 100,
+        },{
+          surface: "10",
+          label: "fDiscountsName",
+          name: "是否享受优惠政策",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
           label: "remark",
           name: "备注",
           checked: 0,
-          width: null,
+          width: 100,
         },
       ],
       allCheck: false,
@@ -809,7 +867,7 @@ export default {
       this.reset();
       this.query();
       this.open = true;
-      this.title = "添加费用信息";
+      this.title = "添加物资信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -817,6 +875,7 @@ export default {
       const fId = row.fId || this.ids;
       getFees(fId).then((response) => {
         this.form = response.data;
+        this.$set(this.form,'fDiscounts',JSON.stringify(this.form.fDiscounts))
         this.open = true;
         this.title = "修改费用信息";
       });
@@ -932,4 +991,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

+ 3 - 1
src/views/project/index1.vue

@@ -899,12 +899,14 @@ export default {
       this.$refs['detailform'].validate((valid) => {
         if (valid) {
           let formData = new window.FormData()
+          console.log(this.detailform)
           formData.append('tProject', JSON.stringify(this.detailform))
           formData.append('tCtnpriceItems', JSON.stringify(this.detailList))
           addChange(formData).then(response => {
             this.$message.success("操作成功")
             if (response.data.tProject) {
-              this.detailForm = response.data.tProject
+              this.detailform = response.data.tProject
+              console.log(this.detailform)
             }
             if (response.data.tCtnpriceItems) {
               this.detailList = response.data.tCtnpriceItems

+ 76 - 34
src/views/warehouse/inStock/index.vue

@@ -43,6 +43,7 @@
         :customButton="customButton"
         :arrow="arrow"
         :seachButton="seachButton"
+        :setRowList="listStyle"
         :listStyle="listStyle"
         :queryList="queryList"/>
       <pagination
@@ -80,7 +81,7 @@
         @totalAmount="totalAmount"
         :seachButton="confirmButton"
         :customButton="detailButton"
-        :listStyle="mainStyle"
+        :listStyle="detailStyle"
         :setRowList="detailStyle"
         :tatolLabel="tatolLabel"
         :listData="listData"
@@ -95,7 +96,7 @@ import MainForm from '@/combination/MainForm'
 import { listInStock, addSave, getSave, getArea,
   getustomer,getEntry, getwarehouse, getGoodName,
   canBedelet, delRows, getWarehousekeeper, addWarehous,
-  deletMain, delFee, copyNew} from '@/api/warehouse/inStock'
+  deletMain, delFee, copyNew, listQuery} from '@/api/warehouse/inStock'
 import Cookies from 'js-cookie'
 export default {
   name: 'inStock',
@@ -301,7 +302,7 @@ export default {
           operation:1
         },{
           surface: "9",
-          label: "fMaterial2",
+          label: "fReviewDate",
           name: "审核日期",
           checked: 0,
           width: 200,
@@ -495,7 +496,7 @@ export default {
           form:3,
           width:200,
           labelSize:'80',
-          rules:'',
+          rules:{ required: true, message: ' ', trigger: 'blur' },
           disabled:false
         },
         {
@@ -663,11 +664,28 @@ export default {
     }
   },
   created() {
+    console.log(Cookies.get("userName"))
+    console.log(this.queryList.tableName)
+    let data = {
+      tableName: this.queryList.tableName,
+      userId: Cookies.get("userName"),
+    };
+    this.getRow(data)
+    let list = {
+      fBilltype:'RK'
+    }
+    this.query(list)
     this.getRow()
     this.getList()
     this.selectMethods()
   },
   methods:{
+    //查询主页列数据
+    query(data){
+      listQuery(data).then(res =>{
+        this.tableData = res.rows
+      })
+    },
     //更换仓库
     changeWarehouse(){
       if(this.detailData.length != 0){
@@ -714,17 +732,19 @@ export default {
     //主页面下拉获取名称
     mainMethods(){
       for(let li in this.formOption){
-        if(this.formOption[li].name == '项目名称'){
-          let queryParams = { pageNum: 1,}
-          getEntry(queryParams).then(res=>{
-            for(let item in res.data){
-              this.formOption[li].data.push({
-                label:res.data[item].projectName,
-                value:res.data[item].fId
-              })
-            }
-          })
-        }else if(this.formOption[li].name == '客户名称'){
+        // if(this.formOption[li].name == '项目名称'){
+        //   let queryParams = { pageNum: 1,}
+        //   getEntry(queryParams).then(res=>{
+        //     for(let item in res.data){
+        //       this.formOption[li].data.push({
+        //         label:res.data[item].projectName,
+        //         value:res.data[item].fId
+        //       })
+        //     }
+        //   })
+        // }
+        // else
+          if(this.formOption[li].name == '客户名称'){
           let queryParams = { pageNum: 1, fTypeid: 1}
           getustomer(queryParams).then(res => {
             for(let item in res.data){
@@ -839,29 +859,43 @@ export default {
     },
     //查询列数据
     getRow() {
-      this.data = {
+      let data = {
         tableName: this.queryList.tableName,
         userId: Cookies.get("userName"),
       };
-      select(this.data).then((res) => {
-        if (res.data.length != 0) {
-          this.queryList.columnList = res.data.filter((e) => e.checked == 0);
-          this.queryList.columnList = res.data;
-          this.queryList.columnList = this.queryList.columnList.reduce((res, item) => {
-            res.push({
-              surface: item.surface,
-              label: item.label,
-              name: item.name,
-              checked: item.checked,
-              width: item.width,
-              fixed: item.fixed,
-            });
-            return res;
-          }, []);
-          this.waitFor = true
+      console.log(data)
+      select(data).then((res) => {
+        if (data.tableName === '仓库入库详情') {
+          if (res.data.length != 0) {
+            this.detailList.columnList = res.data.filter((e) => e.checked == 0);
+            this.detailList.columnList = res.data;
+            this.setRowList = res.data
+            this.detailList.columnList = this.detailList.columnList.filter((e) => e.checked == 0);
+            // this.waitFor = true
+          }else {
+            // this.waitFor = true
+            this.detailList.columnList = this.detailStyle
+            this.setRowList = this.detailStyle
+          }
+          // this.pageDisplay = false
+          // this.isItHidden = false
+          // this.inDex = this.contentOption.length
         }else {
-          this.waitFor = true
-          this.queryList.columnList = this.listStyle
+          if (res.data.length != 0) {
+            this.queryList.columnList = res.data.filter((e) => e.checked == 0);
+            this.queryList.columnList = res.data;
+            this.setRowList = res.data
+            this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0);
+            this.waitFor = true
+          }else {
+            this.waitFor = true
+            this.queryList.columnList = this.listStyle
+            console.log(this.queryList.columnList.fFeeid)
+            this.setRowList = this.listStyle
+          }
+          // this.pageDisplay = true
+          // this.isItHidden = true
+          // this.inDex = 4
         }
       });
     },
@@ -1121,6 +1155,14 @@ export default {
         formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
         formData.append('fBilltype', 'RK')
         addSave(formData).then(res=>{
+          console.log(res)
+          this.detailForm = res.data.warehouseBills
+          this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
+          this.detailData = res.data.tWarehousebillsCntrs
+          for(let li in this.detailData){
+            this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
+            this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+          }
           this.$message.success("操作成功")
         })
       }else if(row.name == '入库确认'){