汽保9.1号

src/views/EquipmentArchives/detailsPage.vue

@@ -112,7 +112,7 @@
         </avue-crud>
       </trade-card>
 
-      <containerTitle title="上传附件  (图片文件像素推荐700X700，有且只允许有一张主图，其余均为副图)"></containerTitle>
+      <containerTitle title="上传附件  (图片文件像素推荐700X700)"></containerTitle>
       <c-upload v-loading="loadingBtn" typeUpload="SBDAFJ"
                 deleteUrl="/blade-client/corpequipmentarchivesfiles/remove" :data="maintenanceFiles" display
                 :enumerationValue="35.1"></c-upload>
@@ -190,7 +190,7 @@
 
 
     <el-dialog
-      title="附件  (图片文件像素推荐700X750，有且只允许有一张主图，其余均为副图)"
+      title="附件  (图片文件像素推荐700X700，有且只允许有一张主图，其余均为副图)"
       :visible.sync="enclosure"
       append-to-body
       width="70%">
@@ -722,6 +722,9 @@ export default {
         .then(res => {
           this.form = res.data.data;
           this.data = res.data.data.corpEquipmentArchivesItemList;
+          this.data.forEach(item=>{
+              item.exitDate = item.exitDate.slice(0,10)
+          })
           this.maintenanceFiles = res.data.data.filesList;
           // this.orderFilesList = res.data.data.orderFilesList ? res.data.data.orderFilesList : [];
         })

src/views/EquipmentArchives/index.vue

@@ -32,6 +32,9 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{ row.sysNo }}
           </span>
         </template>
+          <template slot-scope="{ row, index }" slot="updateUser">
+            <span>{{ row.updateUserNM }}</span>
+          </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-tooltip class="item" effect="dark" content="编辑" placement="top">
             <i class="tradingIcon icon-edit" @click.stop="editOpen(row, 2)"/>
@@ -58,6 +61,8 @@ import {
 } from "@/api/basicData/customerInformation";
 import {getCustomerCode} from "@/enums/management-type";
 import {getToken} from "@/util/auth";
+import {detail} from "@/api/basicData/configuration";
+import {getUser} from "@/api/system/user";
 export default {
   name: "index",
   data() {
@@ -102,17 +107,17 @@ export default {
   },
   methods: {
       // 表格的下拉
-      async expandChange(row, expendList){
-          row.loading = true
-          // this.dataList[row.$index].loading = true
-          const {data} = await corpequipmentarchivesitemList({
-              current: 1,
-              size: 20,
-              pid:row.id
-          })
-          row.orderItemsList = data.data.records
-          row.loading = false
-
+      async expandChange(row, index){
+          console.log(row,index,107)
+          if (row.loading) {
+              const {data} = await corpequipmentarchivesitemList({
+                  current: 1,
+                  size: 20,
+                  pid:row.id
+              })
+              row.orderItemsList = data.data.records
+              row.loading = false
+          }
       },
       // 导出设备
       openExport() {
@@ -159,6 +164,14 @@ export default {
           data
       ).then(res => {
         this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.dataList.forEach(item => {
+              this.$set(item, "orderItemsList", []);
+              this.$set(item, "loading", true);
+              // 获取联系人名字
+              getUser(item.updateUser).then(re=>{
+                  this.$set(item, "updateUserNM", re.data.data.name);
+              })
+          });
         this.page.total = res.data.data.total;
         this.$nextTick(() => {
           this.$refs.crud.doLayout();

src/views/EquipmentArchives/js/optionList.js

@@ -129,7 +129,12 @@ export const option = {
       label: "更新人",
       prop: "updateUser",
       width: 160,
-      index: 12
+      index: 12,
+      // dicUrl: "/api/blade-user/detail?id={{key",
+      // props: {
+      //   label: "name",
+      //   value: "id"
+      // },
     },
     {
       label: "备注",
@@ -154,8 +159,8 @@ export const optionXiala = {
   columnBtn:false,
   column: [
     {
-      label: "设备名称",
-      prop: "cname",
+      label: "设备名",
+      prop: "equipmentDescribe",
       width:'250px',
       overHidden: true
     },
@@ -164,12 +169,12 @@ export const optionXiala = {
       prop: "code",
       overHidden: true
     },
-    {
-      label: "设备描述",
-      prop: "equipmentDescribe",
-      cell: true,
-      overHidden: true
-    },
+    // {
+    //   label: "设备描述",
+    //   prop: "equipmentDescribe",
+    //   cell: true,
+    //   overHidden: true
+    // },
     {
       label: "出厂日期",
       prop: "exitDate",
@@ -260,16 +265,19 @@ export const optionList = {
     {
       label: "出厂日期",
       prop: "exitDate",
+      minWidth:180,
       overHidden: true
     },
     {
       label: "保养日期",
       prop: "maintenanceDate",
+      minWidth:180,
       overHidden: true
     },
     {
       label: "安装日期",
       prop: "installDate",
+      minWidth:180,
       overHidden: true
     },
     {
@@ -281,6 +289,7 @@ export const optionList = {
       label: "工厂",
       prop: "factoryName",
       overHidden: true,
+      minWidth:200,
       cell: true,
     },
     {
@@ -314,22 +323,22 @@ export const optionList = {
     {
       label: "品牌",
       prop: "brand",
-      type: "select",
-      props: {
-        label: "cname",
-        value: "cname"
-      },
-      dicData: [],
       cell: true,
-      change:(val)=>{
-        for(let item of val.column.dicData) {
-          if (val.value == item.cname) {
-            val.row.brandId = item.id
-            break;
-          }
-        }
-
-      }
+      // type: "select",
+      // props: {
+      //   label: "cname",
+      //   value: "cname"
+      // },
+      // dicData: [],
+      // change:(val)=>{
+      //   for(let item of val.column.dicData) {
+      //     if (val.value == item.cname) {
+      //       val.row.brandId = item.id
+      //       break;
+      //     }
+      //   }
+      //
+      // }
     },
     {
       label: "备注",

src/views/basicData/customerInformation/configuration/customerContact.json

@@ -11,6 +11,7 @@
   "index": true,
   "selection": true,
   "menuWidth": 300,
+  "addBtn": false,
   "dialogClickModal": false,
   "column":[
     {
@@ -54,7 +55,14 @@
       "label": "手机号",
       "prop": "tel",
       "index": 4,
-      "width":180
+      "width":180,
+      "rules": [
+        {
+          "required": true,
+          "trigger": "blur"
+
+        }
+      ]
     },{
       "label": "邮箱",
       "prop": "email",

src/views/client/detailsPage.vue

@@ -99,6 +99,9 @@
             @row-save="rowSave"
             @row-update="rowUpdate"
             @row-del="rowDelTwo">
+            <template slot-scope="{ type, size, row, index }" slot="menuLeft">
+                <el-button icon="el-icon-plus" :size="size" type="primary" @click="khrowAddfun">新增</el-button>
+            </template>
           <template slot-scope="{ type, size, row, index }" slot="menu">
             <el-button icon="el-icon-check" :size="size" :type="type" @click="creatingUsers(contactsData[index])">创建用户</el-button>
           </template>
@@ -490,12 +493,16 @@ export default {
     getCorpData(row) {
       this.form.corpName = row.cname
     },
+      // 地址管理添加
     addRow() {
+        if (!this.form.id) return this.$message.warning('请先保存数据');
+        console.log(this.data)
       this.data.push({ $cellEdit: true })
     },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
           let i = 0
+          let j = 0
           for(let item of this.data) {
               if (item.defaultAddres == 1) {
                   i++
@@ -503,6 +510,12 @@ export default {
                       this.$message.warning('默认地址只能有一个');
                       return
                   }
+              }else {
+                  j++
+                  if (j == this.data.length) {
+                      this.$message.warning('请设置默认地址');
+                      return
+                  }
               }
           }
         this.$set(row, "$cellEdit", false);
@@ -675,6 +688,10 @@ export default {
         this.$message.error("请保存数据后再点击");
       }
     },
+      khrowAddfun(){
+          if (!this.form.id) return this.$message.warning('请先保存数据');
+          this.$refs.crudTwo.rowAdd()
+      },
     //新增客户联系人保存触发
     rowSave(row, done, loading) {
       this.contactsData.push(row);

src/views/client/js/optionList.js

@@ -150,6 +150,7 @@ export const option2 = {
     {
       label: "是否是默认地址",
       prop: "defaultAddres",
+      minWidth: 200,
       span: 24,
     },
     {

src/views/maintenanceQ/detailsPage.vue

@@ -38,9 +38,9 @@
                        @change='deviceNameChange' :disabled="option.disabled" filterable placeholder="请选择设备">
               <el-option
                 v-for="item in deviceList"
-                :key="item.cname"
-                :label="item.cname"
-                :value="item.cname">
+                :key="item.equipmentDescribe"
+                :label="item.equipmentDescribe"
+                :value="item.equipmentDescribe">
               </el-option>
             </el-select>
           </template>
@@ -242,6 +242,7 @@ export default {
                 change: (val) => {
                     val.column.dicData.map(item=>{
                         if (val.value == item.cname){
+
                             this.form.deviceId = item.id
                             this.form.deviceDescribe = item.cname
 
@@ -404,11 +405,13 @@ export default {
       return "padding:0;height:40px;";
     },
     deviceNameChange(cname) {
+        console.log(cname,408)
+        console.log(this.deviceList,409)
       for (const item of this.deviceList) {
-        if (item.cname == cname) {
+        if (item.equipmentDescribe == cname) {
 
-          this.form.deviceId = item.srcId
-          this.form.deviceDescribe = item.cname
+          this.form.deviceId = item.id
+          this.form.deviceDescribe = item.equipmentDescribe
 
           this.form.categoryitem = item.categoryitem
           this.form.categoryitemId = item.categoryitemId

src/views/maintenanceQ/js/optionList.js

@@ -42,13 +42,13 @@ export const option = {
       prop: "corpName",
       width:165,
       overHidden: true,
-      search: true,
-      type: 'select',
-      dicData:[],
-      props: {
-        label: 'cname',
-        value: 'cname'
-      },
+      // search: true,
+      // type: 'select',
+      // dicData:[],
+      // props: {
+      //   label: 'cname',
+      //   value: 'cname'
+      // },
       index: 1
     },
     {
@@ -58,8 +58,8 @@ export const option = {
       index: 2
     },
     {
-      label: "设备名称",
-      prop: "deviceName",
+      label: "设备名",
+      prop: "deviceDescribe",
       search: true,
       overHidden: true,
       index: 3

src/views/product/detailsPage.vue

@@ -347,11 +347,15 @@ export default {
                 label: "厂家",
                 prop: "corpId",
                 type: "select",
+                search:true,
+                remote:true,
                 props: {
                     label: "cname",
-                    value: "id"
+                    value: "id",
+                    res:'data.records'
                 },
                 dicData: [],
+                dicUrl: "/api/blade-client/partsCorps/page?corpType=GYS&current=1&size=20&cname={{key}}",
                 span: 6,
                 change:(val)=>{
                     for(let item of val.column.dicData) {
@@ -379,11 +383,13 @@ export default {
                 label: "品牌",
                 prop: "brandId",
                 type: "select",
+                search:true,
+                remote:true,
                 props: {
                     label: "cname",
                     value: "id"
                 },
-                dicUrl: "/api/blade-sales-part/brandDesc/listAll?type=PP",
+                dicUrl: "/api/blade-sales-part/brandDesc/listAll?type=PP&cname={{key}}",
                 span: 6,
                 change:(val)=>{
                     // for(let item of val.column.dicData) {

src/views/system/application/detailsPage.vue

@@ -204,6 +204,13 @@
               label: '安卓包名',
               prop: 'packageName',
               span: 8,
+                rules: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ]
             },
           ],
         },