删除汇总单的上传送货单字段

public/index.html

@@ -244,8 +244,8 @@
   <!-- http://lf.lingqingkeji.com:8080 -->
   <script>
     window._CONFIG = {};
-    window._CONFIG['domianURL'] = 'http://lf.lingqingkeji.com:8080/wmssystem';
-    // window._CONFIG['domianURL'] = 'http://192.168.1.17:8080/wmssystem';
+    // window._CONFIG['domianURL'] = 'http://lf.lingqingkeji.com:8080/wmssystem';
+    window._CONFIG['domianURL'] = 'http://192.168.1.17:8080/wmssystem';
     window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas';
     window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview'
     window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static';

src/components/jeecg/JEditableTable.vue

@@ -20,6 +20,8 @@
               <a-button type="primary" icon="minus" :disabled="disabled">删除</a-button>
               <span class="gap"></span>
             </a-popconfirm>
+            <a-button type="primary" icon="upload" v-if="isSummary && selectedRowIds.length < 2" @click="upLoad">上传送货单</a-button>
+            <iost-delivery-record-pic-modal ref="picModalForm"></iost-delivery-record-pic-modal>
             <template v-if="showClearSelectButton">
               <a-button icon="delete" @click="handleClickClearSelection">清空选择</a-button>
               <span class="gap"></span>
@@ -60,7 +62,6 @@
               class="td"
               :key="col.key"
               :style="buildTdStyle(col)">
-
               <span>{{ col.title }}</span>
             </div>
           </template>
@@ -108,7 +109,7 @@
                       <a-icon type="align-left"/>
                       <a-icon type="align-right"/>
                     </div>
-
+                    
                     <a-menu slot="overlay">
                       <a-menu-item key="0" :disabled="rowIndex===0" @click="_handleRowMoveUp(rowIndex)">向上移</a-menu-item>
                       <a-menu-item key="1" :disabled="rowIndex===(rows.length-1)" @click="_handleRowMoveDown(rowIndex)">向下移</a-menu-item>
@@ -141,7 +142,6 @@
 
                   <!-- 此 v-for 只是为了拼接 id 字符串 -->
                   <template v-for="(id,i) in [`${col.key}${row.id}`]">
-
                     <!-- native input -->
                     <label :key="i" v-if="col.type === formTypes.input || col.type === formTypes.inputNumber">
                       <a-tooltip v-bind="buildTooltipProps(row, col, id)">
@@ -618,6 +618,7 @@
       <j-file-pop ref="filePop" @ok="handleFileSuccess"></j-file-pop>
     </div>
   </a-spin>
+
 </template>
 
 <script>
@@ -631,13 +632,15 @@
   import { getFileAccessHttpUrl } from '@/api/manage';
   import JInputPop from '@/components/jeecg/minipop/JInputPop'
   import JFilePop from '@/components/jeecg/minipop/JFilePop'
+  import IostDeliveryRecordPicModal from '../../views/iost/basedata/modules/IostDeliveryRecordPicModal'
+  //./modules/IostDeliveryRecordPicModal
 
   // 行高，需要在实例加载完成前用到
   let rowHeight = 61
 
   export default {
     name: 'JEditableTable',
-    components: { JDate, Draggable, JInputPop, JFilePop },
+    components: { JDate, Draggable, JInputPop, JFilePop, IostDeliveryRecordPicModal },
     provide() {
       return {
         parentIsJEditableTable: true,
@@ -712,7 +715,11 @@
         type: Object,
         default: () => {}
       },
-      
+      //是否是汇总表
+      isSummary: {
+        type: Boolean,
+        default: false
+      },
 
     },
     data() {
@@ -950,6 +957,13 @@
       
     },
     methods: {
+      //上传送货单图片
+      upLoad(){
+        // let data = {}
+        let rowId = this.getCleanId(this.selectedRowIds[0])
+        this.$refs.picModalForm.editR(rowId)
+      },
+
       getElement(id, noCaseId = false) {
         if (!this.el[id]) {
           this.el[id] = document.getElementById((noCaseId ? '' : this.caseId) + id)
@@ -2147,6 +2161,7 @@
         this.insert(insertIndex)
       },
 
+
       /* --- common function begin --- */
 
       /** input事件 */

src/mixins/JeecgListMixin.js

@@ -238,6 +238,7 @@ export const JeecgListMixin = {
         param['selections'] = this.selectedRowKeys.join(",")
       }
       console.log("导出参数",param)
+      console.log(this.url.exportXlsUrl)
       downFile(this.url.exportXlsUrl,param).then((data)=>{
         if (!data) {
           this.$message.warning("文件下载失败")

src/views/iost/basedata/IostReceivingNoteList.vue

@@ -110,7 +110,7 @@
       </a-table>
     </div>
 
-    <!-- <iost-receiving-note-modal ref="modalForm" @ok="modalFormOk"/> -->
+    <iost-receiving-note-modal ref="modalForm" @ok="modalFormOk"/>
     <iost-receiving-note-copy-modal ref="copyModalForm" @ok="modalFormOk"></iost-receiving-note-copy-modal>
   </a-card>
 </template>
@@ -210,6 +210,12 @@
     methods: {
       initDictConfig(){
       },
+      handleDetail(record)
+      {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "详情";
+        this.$refs.modalForm.disableSubmit = true;
+      },
       handleCopy(record)
       {
         this.$refs.copyModalForm.edit(record);
@@ -217,7 +223,6 @@
         this.$refs.copyModalForm.disableSubmit = true;
       },
       exportReceivingNotePdf(record){
-        console.log(record)
         let url = `${window._CONFIG['domianURL']}/basedata/iostReceivingNote/exportReceivingNotePdf`;
         downFile(url, {deliveryRecordId:record.deliveryRecordId}).then((data) =>
         {        

src/views/iost/basedata/IostSummarySheetList.vue

@@ -97,8 +97,6 @@
           <a-divider type="vertical" />
           <a-popconfirm title="是否根据选中数据生成送货单?" @confirm="() => genDeliveryNote(record)"><a>生成送货单</a></a-popconfirm>
           <a-divider type="vertical" />
-          <a @click="editPic(record)">上传送货单</a>
-          <a-divider type="vertical" />
           <a @click="handleCopy(record)">打印汇总单</a>
           <a-divider type="vertical" />
           <a-dropdown>

src/views/iost/basedata/modules/IostDeliveryRecordPicForm.vue

@@ -68,7 +68,8 @@
         },
         url: {
           add: "/basedata/iostDeliveryRecordPic/add",
-          edit: "/basedata/iostDeliveryRecordPic/edit",
+          edit: "/basedata/iostSummarySheet/updateSummarySheetList",
+          // edit: "/basedata/iostDeliveryRecordPic/edit",///basedata/iostDeliveryRecordPic/edit
           queryById: "/basedata/iostDeliveryRecordPic/queryById"
         }
       }
@@ -100,15 +101,35 @@
       add () {
         this.edit({});
       },
+      editR (record){
+        let that = this;
+        let curId = record;
+        let url = `${window._CONFIG['domianURL']}/basedata/iostDeliveryRecordPic/queryById`;
+        getAction(url,{id:curId}).then((res)=>{
+          console.log("res")
+          console.log(res)
+          that.form.resetFields();
+          if(res.success){
+            that.model = Object.assign({}, res.result);
+          }
+          else
+          {
+            that.model = {id:curId};
+          }
+          that.visible = true;
+          that.$nextTick(() => {
+            that.form.setFieldsValue(pick(that.model,'pic'))
+          })
+        })
+      },
       edit (record) {
         let that = this;
-        let curId = record.deliveryRecordId;
+        let curId = record.deliveryRecordId;//.deliveryRecordId
         let url = `${window._CONFIG['domianURL']}/basedata/iostDeliveryRecordPic/queryById`;
-        
         getAction(url,{id:curId}).then((res)=>{
           console.log("res")
           console.log(res)
-          that.form.resetFields();   
+          that.form.resetFields();
           if(res.success){   
             that.model = Object.assign({}, res.result);
           }

src/views/iost/basedata/modules/IostDeliveryRecordPicModal.vue

@@ -35,6 +35,12 @@
           this.$refs.realForm.add();
         })
       },
+      editR(record){
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.editR(record);
+        })
+      },
       edit (record) {
         this.visible=true
         this.$nextTick(()=>{

src/views/iost/basedata/modules/IostSummarySheetForm.vue

@@ -38,7 +38,9 @@
           :disabled="formDisabled"
           :rowNumber="true"
           :rowSelection="true"
-          :actionButton="true"/>
+          :actionButton="true"
+          :isSummary="true"
+          />
       </a-tab-pane>
     </a-tabs>
   </a-spin>