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

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -86,7 +86,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="true">
-          <el-form-item :label="'计费1单位'+form.fFeetUnit" prop="fFeetUnit">
+          <el-form-item label="计费单位" prop="fFeetUnit">
             <el-select
                 v-model="form.fFeetUnit"
                 placeholder="请选择计费单位"
@@ -1495,7 +1495,7 @@
             <el-col :span="6">
               <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
                 <el-input
-                    v-model.number="importList.fPlangrossweight"
+                    v-model="importList.fPlangrossweight"
                     v-input-limit="2"
                     style="width: 100%"
                     placeholder="毛重">
@@ -1506,7 +1506,7 @@
             <el-col :span="6">
               <el-form-item label="计划净重(kg)" prop="fPlannetweight">
                 <el-input
-                    v-model.number="importList.fPlannetweight"
+                    v-model="importList.fPlannetweight"
                     v-input-limit="2"
                     style="width: 100%"
                     placeholder="净重"
@@ -1531,7 +1531,7 @@
             <el-col :span="6">
               <el-form-item label="毛重(kg)" prop="fGrossweight">
                 <el-input
-                    v-model.number="importList.fGrossweight"
+                    v-model="importList.fGrossweight"
                     v-input-limit="2"
                     style="width: 100%"
                     placeholder="毛重"
@@ -1544,7 +1544,7 @@
             <el-col :span="6">
               <el-form-item label="净重(kg)" prop="fNetweight">
                 <el-input
-                    v-model.number="importList.fNetweight"
+                    v-model="importList.fNetweight"
                     v-input-limit="2"
                     style="width: 100%"
                     placeholder="净重"
@@ -8413,6 +8413,7 @@ export default {
       if (this.$route.query.id) {
         this.$router.push({query: {}});
       }
+      this.form.fId = ''
       this.resetForm("form");
       this.resetForm("importList");
       this.detailList = [];
@@ -8427,11 +8428,9 @@ export default {
         confirmButtonText: "保存",
         cancelButtonText: "取消",
         type: "warning",
-      })
-          .then(() => {
+      }).then(() => {
             this.saveForm("goBack");
-          })
-          .catch(() => {
+          }).catch(() => {
             this.cancel();
           });
     },

src/views/agreement/synthesis/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="app-container">
+    <el-form label-position="right" label-width="80px" :model="form">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="名称">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="活动区域">
+            <el-input v-model="form.region"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="活动形式">
+            <el-input v-model="form.type"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data() {
+    return {
+      form: {
+        name: '',
+        region: '',
+        type: ''
+      }
+    };
+  }
+}
+</script>
+
+<style scoped>
+
+</style>