物资更改

src/settings.js

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

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,
@@ -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>

src/views/warehouse/inStock/index.vue

@@ -301,7 +301,7 @@ export default {
           operation:1
         },{
           surface: "9",
-          label: "fMaterial2",
+          label: "fReviewDate",
           name: "审核日期",
           checked: 0,
           width: 200,
@@ -714,17 +714,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){

vue.config.js

@@ -34,8 +34,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.143:9020`,
+        // target: `http://192.168.1.143:9020`,
         // target: `http://localhost:8080`,
+        target: `https://ap.tubaosoft.com/prod-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''