23.8.23

src/views/BasicSettings/4sManager/index.vue

@@ -23,14 +23,14 @@
     <div
       :style="
         is_open
-          ? 'max-height:200px;transition: all .5s;'
+          ? 'max-height:200px;transition: all .5s;overflow:auto'
           : 'max-height:0px;overflow: hidden;transition: all .5s;'
       "
     >
       <Form :label-width="120" style="display: flex; flex-wrap: wrap">
         <FormItem label="4s店代码">
           <Input
-            v-model="searchData.name"
+            v-model="searchData.code"
             clearable
             style="width: 200px"
             placeholder="请输入"
@@ -38,7 +38,7 @@
         </FormItem>
         <FormItem label="4s店名称">
           <Input
-            v-model="searchData.name"
+            v-model="searchData.title"
             clearable
             style="width: 200px"
             placeholder="请输入"
@@ -86,7 +86,7 @@
         </FormItem>
         <FormItem label="联系电话">
           <Input
-            v-model="searchData.name"
+            v-model="searchData.contract_phone"
             clearable
             style="width: 200px"
             placeholder="请输入"
@@ -151,7 +151,7 @@
         </FormItem>
       </Form>
     </div>
-    <div class="table_content">
+    <div :style="is_open?'height:calc(100% - 220px)':'height:calc(100% - 100px)'">
       <vxe-grid
         v-bind="gridOptions"
         @checkbox-all="selectAllEvent"
@@ -839,6 +839,6 @@ export default {
   margin-bottom: 15px !important;
 }
 .table_content {
-  height: calc(100% - 150px);
+  height: calc(100% - 250px);
 }
-</style>
+</style>

src/views/BasicSettings/workTypeProduct/index.vue

@@ -184,7 +184,7 @@
     <Modal
       draggable
       title="编辑"
-      width="40"
+      width="600"
       :closable="false"
       :mask-closable="false"
       v-model="is_edit"
@@ -488,4 +488,4 @@ export default {
   align-items: center;
   height: 44px;
 }
-</style>
+</style>

src/views/BusinessManagement/Construction/detail.vue

@@ -1170,7 +1170,7 @@ export default {
               { field: 'roll_film_number', title: '卷膜编号', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'roll_film_number' } },
               { field: 'meter', title: '耗用米数', showHeaderOverflow: true, minWidth: 100 },
             ],
-            data: v.detail
+            data: v.detail.length===0?[{ car_depart_id: '', car_depart_name: '', basic_roll_film_id: '', basic_roll_film_name: '', roll_film_id: '', roll_film_name: '', meter: '', roll_film_number: '', roll_film_number_arr: [] }]:v.detail
           }
         })
         //获取卷膜型号
@@ -1179,7 +1179,7 @@ export default {
           this.formData.sub.forEach(c => {
             c.gridOptions.data.forEach(v => {
               this.handleSelectBRF(v.basic_roll_film_id, v);
-              v.roll_film_number_arr = this.rollFilmList.find(c => c.id == v.roll_film_id).roll_film_number_arr;
+              v.roll_film_number_arr = this.rollFilmList.find(c => c.id == v.roll_film_id)?this.rollFilmList.find(c => c.id == v.roll_film_id).roll_film_number_arr:[];
             })
           })
           this.is_ready = true;
@@ -1483,4 +1483,4 @@ export default {
 .btn {
   cursor: pointer;
 }
-</style>
+</style>

src/views/BusinessManagement/Construction/index.vue

@@ -392,4 +392,4 @@ export default {
 .table_content_close {
   height: calc(100% - 90px);
 }
-</style>
+</style>

src/views/BusinessManagement/InventorySheet/detail.vue

@@ -116,10 +116,10 @@
                 transfer
                 filterable
                 clearable
-                allow-create
-                @on-create="handleCreate1($event, row)"
                 @on-change="handleChangeRollFilm($event, row)"
               >
+<!--                allow-create-->
+<!--                @on-create="handleCreate1($event, row)"-->
                 <Option
                   v-for="(item, index) in row.roll_film_number_arr"
                   :key="index"
@@ -483,4 +483,4 @@ export default {
   display: flex;
   align-items: center;
 }
-</style>
+</style>

src/views/BusinessManagement/Picking/detail.vue

@@ -235,6 +235,9 @@
               @on-blur="handleNumberChange(row)"
             />
           </template>
+          <template #mark="{row}">
+            <Input clearable v-model="row.mark" placeholder="请输入" @on-blur="handleMarkChange(row)"/>
+          </template>
         </vxe-grid>
         <!-- <Form :label-width="80" class="form">
           <FormItem label="审核人">
@@ -323,6 +326,15 @@
               v-model="formData.send.take_address"
             />
           </FormItem>
+          <FormItem label="收货电话">
+            <Input
+                clearable
+                placeholder="请输入"
+                style="width: 200px"
+                :disabled="formData.send_status ? true : false"
+                v-model="formData.send.take_phone"
+            />
+          </FormItem>
           <FormItem label="物流公司">
             <Input
               clearable
@@ -567,10 +579,11 @@ export default {
           { field: 'b_r_f_name', title: '卷膜分类', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'b_r_f_name' } },
           { field: 'code', title: '卷膜代码', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'code' } },
           { field: 'title', title: '卷膜型号', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'title' } },
-          { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'number' } }
+          { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'number' } },
+          { field: 'mark', title: '备注', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'mark' } }
         ],
         data: [
-          { roll_film_id: '', apply_number: '', title: '', b_r_f_name: "", basic_roll_film_id: '' }
+          { roll_film_id: '', apply_number: '', title: '', b_r_f_name: "", basic_roll_film_id: '',mark:'' }
         ]
       },
       gridOptions2: {
@@ -592,6 +605,7 @@ export default {
           { field: 'roll_film_number', title: '卷膜编号', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'roll_film_number' } },
           { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100 },
           { field: 'send_number', title: '发货数量', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: "send_number" } },
+          {field: 'mark',title:'备注',showHeaderOverflow: true,minWidth: 100}
         ],
         data: []
       },
@@ -614,6 +628,7 @@ export default {
           { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100 },
           { field: 'send_number', title: '发货数量', showHeaderOverflow: true, minWidth: 100 },
           { field: 'take_number', title: '收货数量', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'take_number' } },
+          {field: 'mark',title:'备注',showHeaderOverflow: true,minWidth: 100}
         ],
         data: []
       },
@@ -637,6 +652,7 @@ export default {
           { field: 'send_number', title: '发货数量', showHeaderOverflow: true, minWidth: 100 },
           { field: 'take_number', title: '收货数量', showHeaderOverflow: true, minWidth: 100 },
           { field: 'in_number', title: '入库数量', showHeaderOverflow: true, minWidth: 100, editRender: {}, slots: { edit: 'in_number' } },
+          {field: 'mark',title:'备注',showHeaderOverflow: true,minWidth: 100}
         ],
         data: []
       },
@@ -730,7 +746,7 @@ export default {
         this.SureFourShopList = this.fourShopList.filter(v => v.company_id == e);
         this.axios.post('/api/rollFilmList', { company_id: e }).then(res => {
           this.rollFilmList = res.data.data;
-          this.gridOptions1.data = [{ roll_film_id: '', apply_number: '', title: '', b_r_f_name: "", basic_roll_film_id: '', rollFilmList: JSON.parse(JSON.stringify(this.rollFilmList)) }];
+          this.gridOptions1.data = [{ roll_film_id: '', apply_number: '', title: '', b_r_f_name: "", basic_roll_film_id: '',mark:'', rollFilmList: JSON.parse(JSON.stringify(this.rollFilmList)) }];
           this.gridOptions2.data = [];
           this.gridOptions3.data = [];
           this.gridOptions4.data = [];
@@ -740,7 +756,7 @@ export default {
         //获取卷膜型号
         this.axios.post('/api/rollFilmList').then(res => {
           this.rollFilmList = res.data.data;
-          this.gridOptions1.data = [{ roll_film_id: '', apply_number: '', title: '', b_r_f_name: "", basic_roll_film_id: '', rollFilmList: JSON.parse(JSON.stringify(this.rollFilmList)) }];
+          this.gridOptions1.data = [{ roll_film_id: '', apply_number: '', title: '', b_r_f_name: "", basic_roll_film_id: '',mark:'', rollFilmList: JSON.parse(JSON.stringify(this.rollFilmList)) }];
           this.gridOptions2.data = [];
           this.gridOptions3.data = [];
           this.gridOptions4.data = [];
@@ -792,7 +808,7 @@ export default {
             { type: 'seq', width: 80, title: '序号', showHeaderOverflow: true },
             { field: 'b_r_f_name', title: '卷膜分类', showHeaderOverflow: true, minWidth: 100 },
             { field: 'title', title: '卷膜型号', showHeaderOverflow: true, minWidth: 100 },
-            { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100 }]
+            { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100 }, {field: 'mark',title:'备注',showHeaderOverflow: true,minWidth: 100}]
         }
         if (res.data.send_status != 0) {
           this.gridOptions2.columns = [
@@ -801,7 +817,7 @@ export default {
             { field: 'title', title: '卷膜型号', showHeaderOverflow: true, minWidth: 100 },
             { field: 'roll_film_number', title: '卷膜编号', showHeaderOverflow: true, minWidth: 100 },
             { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100 },
-            { field: 'send_number', title: '发货数量', showHeaderOverflow: true, minWidth: 100 }]
+            { field: 'send_number', title: '发货数量', showHeaderOverflow: true, minWidth: 100 }, {field: 'mark',title:'备注',showHeaderOverflow: true,minWidth: 100}]
         }
         if (res.data.take_status != 0) {
           this.gridOptions3.columns = [{ field: 'b_r_f_name', title: '卷膜分类', showHeaderOverflow: true, minWidth: 100 },
@@ -809,7 +825,7 @@ export default {
           { field: 'roll_film_number', title: '卷膜编号', showHeaderOverflow: true, minWidth: 100 },
           { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100 },
           { field: 'send_number', title: '发货数量', showHeaderOverflow: true, minWidth: 100 },
-          { field: 'take_number', title: '收货数量', showHeaderOverflow: true, minWidth: 100 }]
+          { field: 'take_number', title: '收货数量', showHeaderOverflow: true, minWidth: 100 }, {field: 'mark',title:'备注',showHeaderOverflow: true,minWidth: 100}]
         }
         if (res.data.in_status != 0) {
           this.gridOptions4.columns = [
@@ -820,7 +836,8 @@ export default {
             { field: 'apply_number', title: '申领数量', showHeaderOverflow: true, minWidth: 100 },
             { field: 'send_number', title: '发货数量', showHeaderOverflow: true, minWidth: 100 },
             { field: 'take_number', title: '收货数量', showHeaderOverflow: true, minWidth: 100 },
-            { field: 'in_number', title: '入库数量', showHeaderOverflow: true, minWidth: 100 }
+            { field: 'in_number', title: '入库数量', showHeaderOverflow: true, minWidth: 100 },
+            {field: 'mark',title:'备注',showHeaderOverflow: true,minWidth: 100}
           ]
         }
         this.gridOptions1.data.forEach(v => {
@@ -925,7 +942,7 @@ export default {
       }
     },
     rowspanMethod({ row, _rowIndex, column, visibleData }) {
-      let fields = ['apply_number']
+      let fields = ['apply_number','mark']
       let cellValue = row['id']
       if (cellValue && fields.includes(column.property)) {
         let prevRow = visibleData[_rowIndex - 1]
@@ -957,21 +974,21 @@ export default {
           floor -= 1;
         }
         if (floor == 0) {
-          this.gridOptions2.data.splice(rowIndex + 1, 0, { is_ad: false, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: '', id: row.id });
-          this.gridOptions3.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: '', id: row.id, take_number: '' });
-          this.gridOptions4.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: '', id: row.id, take_number: '', in_number: '' });
+          this.gridOptions2.data.splice(rowIndex + 1, 0, { is_ad: false, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number,mark:row.mark, roll_film_number: '', send_number: '', id: row.id });
+          this.gridOptions3.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: '', id: row.id, take_number: '' });
+          this.gridOptions4.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: '', id: row.id, take_number: '', in_number: '' });
         } else {
           for (let i = 0; i < floor; i++) {
-            this.gridOptions2.data.splice(rowIndex + i + 1, 0, { is_ad: false, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: row.default_num, id: row.id });
-            this.gridOptions3.data.splice(rowIndex + i + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num });
-            this.gridOptions4.data.splice(rowIndex + i + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num, in_number: row.default_num });
+            this.gridOptions2.data.splice(rowIndex + i + 1, 0, { is_ad: false, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: row.default_num, id: row.id });
+            this.gridOptions3.data.splice(rowIndex + i + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num });
+            this.gridOptions4.data.splice(rowIndex + i + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num, in_number: row.default_num });
           }
         }
 
       } else {
-        this.gridOptions2.data.splice(rowIndex + 1, 0, { is_ad: false, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: '', id: row.id });
-        this.gridOptions3.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: '', id: row.id, take_number: '' });
-        this.gridOptions4.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, roll_film_number: '', send_number: '', id: row.id, take_number: '', in_number: '' });
+        this.gridOptions2.data.splice(rowIndex + 1, 0, { is_ad: false, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: '', id: row.id });
+        this.gridOptions3.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: '', id: row.id, take_number: '' });
+        this.gridOptions4.data.splice(rowIndex + 1, 0, { code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.apply_number, mark:row.mark,roll_film_number: '', send_number: '', id: row.id, take_number: '', in_number: '' });
       }
     },
     handleChangeTake(row, index) {
@@ -1014,6 +1031,23 @@ export default {
         }
       })
     },
+    handleMarkChange(row){
+      this.gridOptions2.data.forEach(v => {
+        if (v.id == row.id) {
+          v.mark = row.mark;
+        }
+      })
+      this.gridOptions3.data.forEach(v => {
+        if (v.id == row.id) {
+          v.mark = row.mark;
+        }
+      })
+      this.gridOptions4.data.forEach(v => {
+        if (v.id == row.id) {
+          v.mark = row.mark;
+        }
+      })
+    },
     handleRemove(row, index) {
       if (this.gridOptions1.data.length > 1) {
         this.gridOptions2.data = this.gridOptions2.data.filter(v => v.id != row.id);
@@ -1025,7 +1059,7 @@ export default {
       }
     },
     handleAdd(index) {
-      this.gridOptions1.data.splice(index + 1, 0, { roll_film_id: '', apply_number: '', title: '', b_r_f_name: "", basic_roll_film_id: '', rollFilmList: JSON.parse(JSON.stringify(this.rollFilmList)) });
+      this.gridOptions1.data.splice(index + 1, 0, { roll_film_id: '', apply_number: '',mark:'', title: '', b_r_f_name: "", basic_roll_film_id: '', rollFilmList: JSON.parse(JSON.stringify(this.rollFilmList)) });
 
     },
     handleSelectRoll(e, row) {
@@ -1042,9 +1076,9 @@ export default {
         row.disable = true;
         row.default_num = this.rollFilmList.find(v => v.id == e).default_num;
         row.id = Date.parse(new Date());
-        this.gridOptions2.data.push({ is_ad: true, default_num: row.default_num, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.number, roll_film_number: '', send_number: row.default_num, id: row.id });
-        this.gridOptions3.data.push({ code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.number, roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num });
-        this.gridOptions4.data.push({ code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.number, roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num, in_number: row.default_num });
+        this.gridOptions2.data.push({ is_ad: true, default_num: row.default_num, code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.number,mark : row.mark, roll_film_number: '', send_number: row.default_num, id: row.id });
+        this.gridOptions3.data.push({ code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.number,mark:row.mark, roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num });
+        this.gridOptions4.data.push({ code: row.code, roll_film_id: row.roll_film_id, title: row.title, b_r_f_name: row.b_r_f_name, basic_roll_film_id: row.basic_roll_film_id, apply_number: row.number,mark:row.mark, roll_film_number: '', send_number: row.default_num, id: row.id, take_number: row.default_num, in_number: row.default_num });
       }
     },
     handleSelectFourShop(e) {
@@ -1055,7 +1089,8 @@ export default {
         this.formData.apply.area = this.fourShopList.find(v => v.id == e).area;
         this.formData.take.take = this.fourShopList.find(v => v.id == e).take_person;
         this.formData.send.take = this.fourShopList.find(v => v.id == e).take_person;
-        this.formData.send.take_address = this.fourShopList.find(v => v.id == e).address
+        this.formData.send.take_address = this.fourShopList.find(v => v.id == e).take_address
+        this.formData.send.take_phone = this.fourShopList.find(v => v.id == e).take_phone
         this.formData.company_id = this.fourShopList.find(v => v.id == e).company_id;
       } else {
         this.formData.storehouse_id = '';
@@ -1065,7 +1100,7 @@ export default {
         this.formData.take.take = '';
         this.formData.send.take = '';
         this.formData.send.take_address = '';
-
+        this.formData.send.take_phone= '';
       }
     }
   }
@@ -1097,4 +1132,4 @@ export default {
     }
   }
 }
-</style>
+</style>