Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -1,9 +1,9 @@
 {
     "lazy": true,
     "tip": false,
+    "searchMenuPosition": "right",
     "simplePage": true,
     "searchShow": true,
-    "searchMenuSpan": 6,
     "dialogWidth": "60%",
     "tree": true,
     "border": true,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -10,7 +10,6 @@
       <el-button
           class="el-button--small-yh add-customer-btn"
           type="primary"
-          :disabled="disabled"
           @click="editCustomer"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
@@ -24,7 +23,8 @@
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
                                 size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
+                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
+                                 :configuration="configuration"/>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -35,8 +35,7 @@
           <el-row>
             <el-col v-for="(item,index) in contactInformation.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
-                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :configuration="configuration"/>
                 <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
@@ -116,7 +115,8 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
-              >新增</el-button>
+              >新增
+              </el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -414,19 +414,25 @@ import commodity from "./configuration/commodity.json"
 import optionTwoCost from "./configuration/mainListCost.json"
 import optionPolicy from "./configuration/optionPolicy.json"
 import BuyFree from "./configuration/BuyFree.json"
-import {getDeptLazyTree,getDeptLazyTreeTwo, customerList,policyList,policyColumn} from "@/api/basicData/basicFeesDesc";
+import {
+  getDeptLazyTree,
+  getDeptLazyTreeTwo,
+  customerList,
+  policyList,
+  policyColumn
+} from "@/api/basicData/basicFeesDesc";
 
 export default {
   name: "detailsPage",
   data() {
     return {
       form: {},
-      configuration:{
-        multipleChoices:false,
-        multiple:false,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
       },
       data: [],
       dataPolicy: [],
@@ -538,11 +544,10 @@ export default {
       dialogVisible: false,
       policyDialog: false,
       advantageProjectForm: {},
-      selection:[],
+      selection: [],
       bankOfDepositForm: {},
       contactsData: [],
       advantageProjectData: [],
-      disabled: false,
       bankOfDepositData: [],
       tableDataCost: [],
       dic: [],
@@ -689,7 +694,7 @@ export default {
             ]
           }, {
             label: '制单人',
-            prop: 'createUser',
+            prop: 'createUserName',
             rules: [
               {
                 required: false,
@@ -922,16 +927,7 @@ export default {
   created() {
     if (this.$route.query.id) {
       let id = this.$route.query.id.replace(/\"/g, "")
-      detail(id).then(res => {
-        console.log(res.data.data)
-        this.form = res.data.data;
-        this.contactsData = this.form.orderItemsList
-        this.advantageProjectData = this.form.orderFeesList
-        this.bankOfDepositData = this.form.orderFilesList
-        delete this.form.orderItemsList
-        delete this.form.orderFeesList
-        delete this.form.orderFilesList
-      });
+      this.queryData(id)
     }
   },
   watch: {
@@ -949,6 +945,20 @@ export default {
     }
   },
   methods: {
+    queryData(id){
+      detail(id).then(res => {
+        console.log(res.data.data)
+        this.form = res.data.data;
+        this.contactsData = this.form.orderItemsList
+        this.advantageProjectData = this.form.orderFeesList
+        this.bankOfDepositData = this.form.orderFilesList
+        this.configuration.dicData = this.form.corpName
+        delete this.form.orderItemsList
+        delete this.form.orderFeesList
+        delete this.form.orderFilesList
+        delete this.form.corpName
+      });
+    },
     //点击行可编辑
     handleRowClick(row, event, column) {
       console.log(row.$index)
@@ -974,14 +984,14 @@ export default {
       this.commodityData = false
     },
     //政策价格导入
-    policy(){
+    policy() {
       this.policyDialog = !this.policyDialog
     },
     //生成发货单
-    generateShipmentD(){
+    generateShipmentD() {
       let lsit = []
-      for (let item in this.selection){
-        if (!this.selection[item].id){
+      for (let item in this.selection) {
+        if (!this.selection[item].id) {
           return this.$confirm('商品信息有未保存数据, 是否立即保存?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -994,15 +1004,15 @@ export default {
               message: '已取消'
             });
           });
-          }else {
+        } else {
           lsit.push(this.selection[item].id)
         }
       }
       let data = {
-        id:this.form.id,
+        id: this.form.id,
         orderItemIds: lsit
       }
-      generateShipment(data).then(res=>{
+      generateShipment(data).then(res => {
         console.log(res.data.data)
         this.$router.push({
           path: "deliveryNotice_detailsPageEdit",
@@ -1011,7 +1021,7 @@ export default {
       })
     },
     //商品选中触发
-    productSelection(selection){
+    productSelection(selection) {
       this.selection = selection
     },
     //点击费用明细选择触发
@@ -1103,9 +1113,9 @@ export default {
       this.onLoad(this.page);
     },
     //导入页销售政策查询
-    policyNodeClick(data){
+    policyNodeClick(data) {
       console.log(data.id)
-      detailList(data.id).then(res=>{
+      detailList(data.id).then(res => {
         console.log(res.data.data)
         //特价促销
         this.dataPolicy = res.data.data.specialItemList
@@ -1125,15 +1135,15 @@ export default {
       this.onLoad(this.page);
     },
     //销售政策特价促销选中触发
-    selectionChangePolicy(list){
+    selectionChangePolicy(list) {
       this.policyData = list
     },
     //销售政策买赠促销选中触发
-    selectionChangePolicyTwo(list){
+    selectionChangePolicyTwo(list) {
       this.policyDataTwo = list
     },
     //导入商品政策
-    importPolicy(){
+    importPolicy() {
       let list = this.policyData.concat(this.policyDataTwo)
       console.log(list)
       for (let item in list) {
@@ -1293,12 +1303,12 @@ export default {
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
           }
-          this.disabled = true
           this.form.billType = 'XS'
           typeSave(this.form).then(res => {
             this.$message({type: "success", message: this.form.id ? "修改成功!" : "新增成功!"});
+            this.queryData(res.data.data.id)
             //成功关闭此页面回到列表页
-            this.backToList()
+            // this.backToList()
           })
         } else {
           return false;

src/views/businessManagement/salesOrder/index.vue

@@ -68,8 +68,10 @@ export default {
     }
   },
   created() {
-    console.log('wangbadan')
-    // this.onLoad()
+    if (parseInt(this.option.column.length / 4) !== this.option.column.length / 4){
+      this.option.searchMenuSpan = 6;
+      this.option.searchMenuPosition = "center";
+    }
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)