戴艳蓉 3 years ago
parent
commit
2db0baab6f

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-35677972.d5988154.js


+ 1 - 0
src/config/env.production.js

@@ -17,5 +17,6 @@ module.exports = {
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
     //应用凭证
     AgentId:"1324690581"
+    
   }
 }

+ 2 - 2
src/views/goodStore/brand/addEdit.vue

@@ -78,7 +78,7 @@
 <script>
 import asyncRequest from "@/apis/service/goodStore/brand";
 import resToken from "@/mixins/resToken";
-import { hasChinese } from "@/utils/validate";
+import { isChinese } from "@/utils/validate";
 export default {
   name: "brand",
   props: ["showModel", "id", "sitem"],
@@ -87,7 +87,7 @@ export default {
     const validateusername = (rule, value, callback) => {
       if (value === "") {
         callback(new Error("品牌名称不能为空!"));
-      } else if (!hasChinese(value)) {
+      } else if (!isChinese(value)) {
         callback(new Error("品牌名称必须包含汉字!"));
       } else {
         callback();

+ 2 - 2
src/views/goodStore/sort/addEdit.vue

@@ -88,7 +88,7 @@
 <script>
 import asyncRequest from "@/apis/service/goodStore/sort";
 import resToken from "@/mixins/resToken";
-import { hasChinese } from "@/utils/validate";
+import { isChinese } from "@/utils/validate";
 export default {
   name: "sort",
   props: ["showModel", "id", "sitem", "titleList"],
@@ -97,7 +97,7 @@ export default {
     const validate_fund_code = (rule, value, callback) => {
       if (value === "") {
         callback();
-      } else if (hasChinese(value)) {
+      } else if (isChinese(value)) {
         callback(new Error("财务核算码不能包含汉字!"));
       } else {
         callback();

+ 5 - 3
src/views/sellOut/project/components/columnsForm.js

@@ -1,9 +1,11 @@
 export default [
+    
     {
-        prop: "num",
-        label: "商品编号",
-        width: '110px'
+        prop: "pgNo",
+        label: "要求编号",
+        width: '180px'
     },
+    
     {
         prop: "sale_price",
         label: "销售单价",

+ 5 - 3
src/views/sellOut/project/components/setPlan.vue

@@ -11,6 +11,8 @@
             stripe
             style="width: 100%"
           >
+            <el-table-column label="要求编码" prop="pgNo" width="180px" />
+
             <el-table-column prop="good_type" label="商品类型" width="80px">
               <template slot-scope="scope">
                 <el-tag
@@ -71,7 +73,7 @@
               searchList();
             "
           >
-            <template #operation="{ scope }">
+            <!-- <template #operation="{ scope }">
               <el-tooltip
                 effect="dark"
                 content="删除"
@@ -83,7 +85,7 @@
                   @click="deleteId(scope.row.id)"
                 ></i>
               </el-tooltip>
-            </template>
+            </template> -->
           </ex-table>
         </template>
       </div>
@@ -164,7 +166,7 @@ export default {
         total: 0,
       };
       this.tableData = [];
-      await  this.searchList()
+      await this.searchList();
     },
     //页数选择
     async handlePageChange(e) {

Some files were not shown because too many files changed in this diff