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

src/main.js

@@ -48,7 +48,9 @@ Vue.use(format);//v-format
 Vue.component('basicContainer', basicContainer);
 Vue.component('basicBlock', basicBlock);
 Vue.component('thirdRegister', thirdRegister);
-Vue.component('avueUeditor', avueUeditor);
+//此处有个问题，下面这句不能使用
+// Vue.component('avueUeditor', avueUeditor);
+Vue.use(avueUeditor);
 //自定义标题
 import containerTitle from './components/titleComponent/main.vue';
 Vue.component('containerTitle', containerTitle);

src/views/basicData/commodityType/configuration/customerPurchase.json

@@ -0,0 +1,127 @@
+{
+    "lazy": true,
+    "tip": false,
+    "simplePage": true,
+    "searchShow": true,
+    "addBtn":false,
+    "editBtn":false,
+    "addRowBtn":true,
+    "cellBtn":false,
+    "cancelBtn":false,
+    "refreshBtn": false,
+    "searchMenuSpan": 6,
+    "dialogWidth": "60%",
+    "tree": true,
+    "border": true,
+    "index": true,
+    "selection": true,
+    "menuWidth": 300,
+    "dialogClickModal": false,
+    "column":[
+        {
+            "label": "供应商",
+            "prop": "code",
+            "index": 1,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": true,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        },{
+            "label": "计价单位",
+            "prop": "bigCharacter",
+            "index": 1,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": true,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        },{
+            "label": "币别",
+            "prop": "brand",
+            "index": 2,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": false,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        },{
+            "label": "采购单价",
+            "prop": "brandItem",
+            "index": 3,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": false,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        },{
+            "label": "是否含税",
+            "prop": "typeno",
+            "index": 4,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": false,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        },{
+            "label": "税率",
+            "prop": "typeno",
+            "index": 4,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": false,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        },{
+            "label": "金额",
+            "prop": "typeno",
+            "index": 4,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": false,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        },{
+            "label": "备注",
+            "prop": "typeno",
+            "index": 4,
+            "width":100,
+            "cell": true,
+            "rules": [
+                {
+                    "required": false,
+                    "message": " ",
+                    "trigger": "blur"
+                }
+            ]
+        }
+    ]
+}

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -78,9 +78,32 @@
             </template>
           </avue-crud>
         </basic-container>
-        <containerTitle title="附件"></containerTitle>
+        <containerTitle title="采购价格"></containerTitle>
+        <basic-container style="margin-bottom: 10px">
+          <avue-crud
+              :option="customerPurchase"
+              v-model="contactsForm"
+              :data="contactsData"
+              ref="crudContact"
+              @row-save="rowSave"
+              @row-click="handleRowClick"
+              @row-update="rowUpdate"
+              @row-del="rowDel">
+            <template slot-scope="{row,index}" slot="menu">
+              <el-button
+                  type="text"
+                  size="small"
+                  @click="rowCell(row,index)"
+              >{{ row.$cellEdit ? '保存' : '修改' }}
+              </el-button>
+            </template>
+          </avue-crud>
+        </basic-container>
+        <containerTitle title="商品图片"></containerTitle>
+        <basic-container style="margin-bottom: 10px">
+        </basic-container>
+        <containerTitle title="详情页编辑"></containerTitle>
         <basic-container style="margin-bottom: 10px">
-          {{text}}
           <avue-ueditor v-model="text" :options="options"></avue-ueditor>
         </basic-container>
       </el-form>
@@ -89,6 +112,7 @@
 </template>
 <script>
 import customerContact from "./configuration/customerContact.json"
+import customerPurchase from "./configuration/customerPurchase.json"
 import {detail, corpsattn, typeSave} from "@/api/maintenance/priceManagement"
 export default {
   name: "detailsPage",
@@ -97,34 +121,17 @@ export default {
       text: '<h1 class="ql-align-center" style="text-align: center;"><a href="https://avuejs.com/doc/plugins/ueditor-plugins" target="_blank" style="font-weight: bold; color: rgb(194, 79, 74);">欢迎使用Avue富文本编辑器</a></h1><p class="ql-align-center" style="text-align: center;"><span style="font-weight: bold; color: rgb(194, 79, 74);"><img src="https://avuejs.com/images/logo-bg.jpg" height="200" width="200"></span></p>',
       options: {
         //普通图片上传
-        action: "https://avuejs.com/upload",
-        customConfig: {
-          lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
-        },//wangEditor编辑的配置
+        action: "https://avuejs.com/imgupload",
+        customConfig: {}, //wangEditor编辑的配置
         props: {
           res: "data",
-          url:'url'
+          url: "url",
         },
-        //七牛云oss配置
-        qiniu: {
-          AK: "",
-          SK: "",
-          scope: "test",
-          url: "http://pm7cc17lu.bkt.clouddn.com/",
-          deadline: 1
-        },
-        //阿里云oss配置
-        ali: {
-          region: "oss-cn-beijing",
-          endpoint: "oss-cn-beijing.aliyuncs.com",
-          accessKeyId: "",
-          accessKeySecret: "",
-          bucket: "avue"
-        }
       },
       form: {},
       disabled: false,
       customerContact: customerContact,
+      customerPurchase: customerPurchase,
       contactsForm: {},
       contactsData: [],
       basicData: {