Browse Source

修改下拉不允许清除,一键操作,核算部门。文件中心

Qukatie 1 year ago
parent
commit
0765bc6afc

+ 5 - 1
src/components/iosbasic-data/TreeSelect.vue

@@ -4,7 +4,7 @@
         :value="value"
         :placeholder="placeholder"
         :size="size"
-        clearable
+        :clearable="clearable"
         :disabled="disabled"
         :filterable="filterable"
         :filter-method="filterMethod"
@@ -52,6 +52,10 @@ export default {
             type: Boolean,
             default: false
         },
+        clearable: {
+            type: Boolean,
+            default: true
+        },
         // 树形的数据
         data: {
             type: Array,

+ 9 - 3
src/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue

@@ -192,7 +192,7 @@
 
         form: {},
         query: {},
-        loading: true,
+        loading:false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -507,15 +507,21 @@
       refreshChange() {
         this.onLoad(this.page, this.query);
       },
+      getData(form){
+        this.assemblyForm=form
+        this.onLoad(this.page,form);
+      },
       onLoad(page, params = {}) {
-        this.loading = true;
-        filescenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        if(this.assemblyForm.id){
+          this.loading = true;
+          filescenterList(page.currentPage, page.pageSize, Object.assign({pid:this.assemblyForm.id}, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
           this.selectionClear();
         });
+        }
       },
 
         // 更改表格颜色

+ 11 - 9
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -70,7 +70,7 @@
                                                                       :selectValue="form[item[0].prop]"
                                                                       :filterable="true"
                                                                       :allowCreate="item[0].allowCreate || false"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[0].disabled"
                                                                       :buttonIf="false"
@@ -83,7 +83,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[0].disabled"
-                                                                  clearable :placeholder="item[0].text || 0" ></el-input>
+                                                                  :placeholder="item[0].text || 0" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[1]" :span="item[1].span?item[1].span:12">
@@ -102,7 +102,7 @@
                                                                       :datalist="item[1].dicData"
                                                                       :selectValue="form[item[1].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[1].disabled"
                                                                       :buttonIf="false"
@@ -121,6 +121,7 @@
                                                                      size="small"
                                                                      :disabled="detailData.seeDisabled || item[1].disabled"
                                                                      :multiple="false"
+                                                                     :clearable="false"
                                                                      :placeholder="`${item[1].text || ''}`"
                                                                      @input="corpChange($event,item[1].prop)">
                                                         </tree-select>
@@ -128,7 +129,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[1].text || ''" ></el-input>
+                                                                  :placeholder="item[1].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[2]" :span="item[2].span?item[2].span:12">
@@ -141,7 +142,7 @@
                                                                       :datalist="item[2].dicData"
                                                                       :selectValue="form[item[2].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[2].disabled"
                                                                       :buttonIf="false"
@@ -154,7 +155,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[2].text || ''" ></el-input>
+                                                                  :placeholder="item[2].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                             </el-row>
@@ -169,7 +170,7 @@
                                                               :datalist="item.dicData"
                                                               :selectValue="form[item.prop]"
                                                               :filterable="true"
-                                                              :clearable="true"
+                                                              :clearable="false"
                                                               :remote="true"
                                                               :disabled="detailData.seeDisabled || item.disabled"
                                                               :buttonIf="item.buttonIf"
@@ -184,7 +185,7 @@
                                                 <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
                                                           size="small" autocomplete="off"
                                                           :disabled="detailData.seeDisabled || item.disabled"
-                                                          clearable :placeholder="item.text || ''" ></el-input>
+                                                          :placeholder="item.text || ''" ></el-input>
                                             </el-form-item>
                                         </div>
                                     </el-col>
@@ -215,7 +216,7 @@
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="KYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
-                                    <filescenter :assemblyForm="form" :detailData="detailData"></filescenter>
+                                    <filescenter ref="filescenter" :assemblyForm="form" :detailData="detailData"></filescenter>
                                 </el-tab-pane>
                             </el-tabs>
                         </basic-container>
@@ -1538,6 +1539,7 @@ import {
                         item.edit = false
                     }
                     // 文件中心
+                    this.$refs.filescenter.getData(res.data.data)
                     for(let item of this.form.filesList) {
                         this.$set(item,'edit',false)
                     }

+ 12 - 3
src/views/iosBasicData/AirtransportImport/bills/assembly/filescenter.vue

@@ -192,7 +192,7 @@
 
         form: {},
         query: {},
-        loading: true,
+        loading:false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -507,15 +507,24 @@
       refreshChange() {
         this.onLoad(this.page, this.query);
       },
+      getData(form){
+        this.assemblyForm=form
+        this.onLoad(this.page,form);
+      },
       onLoad(page, params = {}) {
-        this.loading = true;
-        filescenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        // if(!this.assemblyForm.id) return
+
+        if(this.assemblyForm.id){
+          this.loading = true;
+          filescenterList(page.currentPage, page.pageSize, Object.assign({pid:this.assemblyForm.id}, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
           this.selectionClear();
         });
+        }
+       
       },
 
         // 更改表格颜色

+ 11 - 9
src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -70,7 +70,7 @@
                                                                       :selectValue="form[item[0].prop]"
                                                                       :filterable="true"
                                                                       :allowCreate="item[0].allowCreate || false"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[0].disabled"
                                                                       :buttonIf="false"
@@ -83,7 +83,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[0].disabled"
-                                                                  clearable :placeholder="item[0].text || ''" ></el-input>
+                                                                 :placeholder="item[0].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[1]" :span="item[1].span?item[1].span:12">
@@ -102,7 +102,7 @@
                                                                       :datalist="item[1].dicData"
                                                                       :selectValue="form[item[1].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[1].disabled"
                                                                       :buttonIf="false"
@@ -121,6 +121,7 @@
                                                                      size="small"
                                                                      :disabled="detailData.seeDisabled || item[1].disabled"
                                                                      :multiple="false"
+                                                                     :clearable="false"
                                                                      :placeholder="`${item[1].text || ''}`"
                                                                      @input="corpChange($event,item[1].prop)">
                                                         </tree-select>
@@ -128,7 +129,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[1].text || ''" ></el-input>
+                                                                  :placeholder="item[1].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[2]" :span="item[2].span?item[2].span:12">
@@ -141,7 +142,7 @@
                                                                       :datalist="item[2].dicData"
                                                                       :selectValue="form[item[2].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[2].disabled"
                                                                       :buttonIf="false"
@@ -154,7 +155,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[2].text || ''" ></el-input>
+                                                                  :placeholder="item[2].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                             </el-row>
@@ -169,7 +170,7 @@
                                                               :datalist="item.dicData"
                                                               :selectValue="form[item.prop]"
                                                               :filterable="true"
-                                                              :clearable="true"
+                                                              :clearable="false"
                                                               :remote="true"
                                                               :disabled="detailData.seeDisabled || item.disabled"
                                                               :buttonIf="item.buttonIf"
@@ -184,7 +185,7 @@
                                                 <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
                                                           size="small" autocomplete="off"
                                                           :disabled="detailData.seeDisabled || item.disabled"
-                                                          clearable :placeholder="item.text || ''" ></el-input>
+                                                          :placeholder="item.text || ''" ></el-input>
                                             </el-form-item>
                                         </div>
                                     </el-col>
@@ -215,7 +216,7 @@
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="KYJK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
-                                    <filescenter :assemblyForm="form" :detailData="detailData"></filescenter>
+                                    <filescenter ref="filescenter" :assemblyForm="form" :detailData="detailData"></filescenter>
                                 </el-tab-pane>
                             </el-tabs>
                         </basic-container>
@@ -1533,6 +1534,7 @@ import {
                         item.edit = false
                     }
                     // 文件中心
+                    this.$refs.filescenter.getData(res.data.data)
                     for(let item of this.form.filesList) {
                         this.$set(item,'edit',false)
                     }

+ 9 - 1
src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -30,6 +30,8 @@
                    @click.stop="handleDelete">一键删除
         </el-button>
         <el-button type="primary" size="small" :disabled="seeDisabled" @click="batchSavefun" >一键保存</el-button>
+        <el-button type="info" plain size="small" :disabled="seeDisabled"
+                           @click="onclickEdit">一键编辑   </el-button>
         <!--<el-button type="success" size="small" plain :disabled="seeDisabled"-->
         <!--           @click.stop="equalDistribution">均分箱量-->
         <!--</el-button>-->
@@ -145,7 +147,7 @@ import {number} from "echarts";
             cancelBtn:false,
             cellBtn:true, // 行编辑
             menuWidth:140,
-            menu:true,
+            menu:false,
           column: [
             {
               label: "尺码箱型",
@@ -306,6 +308,12 @@ import {number} from "echarts";
           this.option = await this.getColumnData(this.getColumnName(309.1), this.optionBack);
       },
       methods: {
+        onclickEdit(){
+            for (let item of this.assemblyForm.preContainersList) {
+                this.$delete(item, '$cellEdit')
+                this.$set(item,'$cellEdit',true)
+            }
+        },
         // 件数失焦事件
         numberBlur(row){
             let quantityNum = 0

+ 10 - 3
src/views/iosBasicData/OceanFreightImport/bills/assembly/filescenter.vue

@@ -192,7 +192,7 @@
 
         form: {},
         query: {},
-        loading: true,
+        loading:false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -508,15 +508,22 @@
       refreshChange() {
         this.onLoad(this.page, this.query);
       },
+      getData(form){
+        this.assemblyForm=form
+        this.onLoad(this.page,form);
+      },
       onLoad(page, params = {}) {
-        this.loading = true;
-        filescenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        if(this.assemblyForm.id){
+          this.loading = true;
+        filescenterList(page.currentPage, page.pageSize, Object.assign({pid:this.assemblyForm.id}, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
           this.selectionClear();
         });
+        }
+
       },
 
         // 更改表格颜色

+ 11 - 9
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -89,7 +89,7 @@
                                                                       :selectValue="form[item[0].prop]"
                                                                       :filterable="true"
                                                                       :allowCreate="item[0].allowCreate || false"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[0].disabled"
                                                                       :buttonIf="false"
@@ -102,7 +102,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[0].disabled"
-                                                                  clearable :placeholder="item[0].text || ''" ></el-input>
+                                                                  :placeholder="item[0].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col :span="item[1].span?item[1].span:12">
@@ -121,7 +121,7 @@
                                                                       :datalist="item[1].dicData"
                                                                       :selectValue="form[item[1].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[1].disabled"
                                                                       :buttonIf="false"
@@ -140,6 +140,7 @@
                                                                      size="small"
                                                                      :disabled="detailData.seeDisabled || item[1].disabled"
                                                                      :multiple="false"
+                                                                     :clearable="false"
                                                                      :placeholder="`${item[1].text || ''}`"
                                                                      @input="corpChange($event,item[1].prop)">
                                                         </tree-select>
@@ -147,7 +148,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[1].text || ''" ></el-input>
+                                                                  :placeholder="item[1].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[2]" :span="item[2].span?item[2].span:12">
@@ -160,7 +161,7 @@
                                                                       :datalist="item[2].dicData"
                                                                       :selectValue="form[item[2].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[2].disabled"
                                                                       :buttonIf="false"
@@ -173,7 +174,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[2].text || ''" ></el-input>
+                                                                  :placeholder="item[2].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                             </el-row>
@@ -189,7 +190,7 @@
                                                               :datalist="item.dicData"
                                                               :selectValue="form[item.prop]"
                                                               :filterable="true"
-                                                              :clearable="true"
+                                                              :clearable="false"
                                                               :remote="true"
                                                               :disabled="detailData.seeDisabled || item.disabled"
                                                               :buttonIf="item.buttonIf"
@@ -209,7 +210,7 @@
                                                 <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
                                                           size="small" autocomplete="off"
                                                           :disabled="detailData.seeDisabled || item.disabled"
-                                                          clearable :placeholder="item.text || ''" ></el-input>
+                                                          :placeholder="item.text || ''" ></el-input>
                                             </el-form-item>
                                         </div>
                                     </el-col>
@@ -246,7 +247,7 @@
                                 <!--    <edicode :assemblyForm="form" :detailData="detailData"></edicode>-->
                                 <!--</el-tab-pane>-->
                                 <el-tab-pane label="文件中心" name="seventh">
-                                    <filescenter :assemblyForm="form" :detailData="detailData" @billsDetailfun="billsDetailfun(form.id)"></filescenter>
+                                    <filescenter ref="filescenter" :assemblyForm="form" :detailData="detailData" @billsDetailfun="billsDetailfun(form.id)"></filescenter>
                                 </el-tab-pane>
                             </el-tabs>
                         </basic-container>
@@ -1610,6 +1611,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     item.edit = false
                 }
                 // 文件中心
+                this.$refs.filescenter.getData(res.data.data)
                 for(let item of this.form.filesList) {
                     this.$set(item,'edit',false)
                 }

+ 1 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -244,6 +244,7 @@ export default {
           dialogClickModal: false,
           refreshBtn:false,
           columnBtn:false,
+          menu:false,
           column: [
               {
                   label: "箱型",

+ 11 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -30,6 +30,9 @@
                    @click.stop="handleDelete">一键删除
         </el-button>
         <el-button type="primary" size="small" :disabled="seeDisabled" @click="batchSavefun" >一键保存</el-button>
+        <el-button type="info" plain size="small" :disabled="seeDisabled"
+                           @click="onclickEdit">一键编辑
+                </el-button>
         <el-button type="success" size="small" plain :disabled="seeDisabled"
                    @click.stop="equalDistribution">一键配箱
         </el-button>
@@ -141,13 +144,14 @@ import {
           viewBtn: true,
           selection: true,
           labelWidth:'120',
+          
           dialogClickModal: false,
             updateBtn:false,
             saveBtn:false,
             cancelBtn:false,
             cellBtn:true, // 行编辑
             menuWidth:130,
-            menu:true,
+            menu:false,
           column: [
             {
               label: "尺码箱型",
@@ -308,6 +312,12 @@ import {
           this.option = await this.getColumnData(this.getColumnName(309.1), this.optionBack);
       },
       methods: {
+        onclickEdit(){
+            for (let item of this.assemblyForm.preContainersList) {
+                this.$delete(item, '$cellEdit')
+                this.$set(item,'$cellEdit',true)
+            }
+        },
         // 件数失焦事件
         numberBlur(row){
             let quantityNum = 0

+ 12 - 7
src/views/iosBasicData/SeafreightExportF/bills/assembly/filescenter.vue

@@ -195,7 +195,7 @@
 
         form: {},
         query: {},
-        loading: true,
+        loading: false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -510,19 +510,24 @@
       refreshChange() {
         this.onLoad(this.page, this.query);
       },
+      getData(form){
+        this.assemblyForm=form
+        this.onLoad(this.page,form);
+      },
       onLoad(page, params = {}) {
-        if(!this.assemblyForm.id) return
-        this.loading = true;
-        params.pid=this.assemblyForm.id
-        params.businessType=this.assemblyForm.businessType
-        console.log(this.assemblyForm,  "id", this.pid, "assemblyForm.id", this.assemblyForm.id, "billNo", this.assemblyForm.billNo)
-        filescenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        // if(!this.assemblyForm.id) return
+
+        if(this.assemblyForm.id){
+          this.loading = true;
+          filescenterList(page.currentPage, page.pageSize, Object.assign({pid:this.assemblyForm.id}, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
           this.selectionClear();
         });
+        }
+       
       },
 
         // 更改表格颜色

+ 14 - 13
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -98,7 +98,6 @@
                                                                       :selectValue="form[item[0].prop]"
                                                                       :filterable="true"
                                                                       :allowCreate="item[0].allowCreate || false"
-                                                                      :clearable="true"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[0].disabled"
                                                                       :buttonIf="false"
@@ -111,7 +110,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[0].disabled"
-                                                                  clearable :placeholder="item[0].text || ''" ></el-input>
+                                                                  :placeholder="item[0].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col :span="item[1].span?item[1].span:12">
@@ -130,7 +129,6 @@
                                                                       :datalist="item[1].dicData"
                                                                       :selectValue="form[item[1].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[1].disabled"
                                                                       :buttonIf="false"
@@ -142,11 +140,12 @@
                                                         </search-query>
 
                                                         <tree-select v-else-if="item[1].type == 'tree'"
-                                                                     v-model="form[item[1].prop]" filterable
+                                                                     v-model="form[item[1].prop]"
                                                                      :data="item[1].dicData"
                                                                      :props="item[1].forParameter"
                                                                      nodeKey="title"
                                                                      size="small"
+                                                                     :clearable="false"
                                                                      :disabled="detailData.seeDisabled || item[1].disabled"
                                                                      :multiple="false"
                                                                      :placeholder="`${item[1].text || ''}`"
@@ -156,7 +155,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[1].text || ''" ></el-input>
+                                                                  :placeholder="item[1].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[2]" :span="item[2].span?item[2].span:12">
@@ -169,7 +168,7 @@
                                                                       :datalist="item[2].dicData"
                                                                       :selectValue="form[item[2].prop]"
                                                                       :filterable="true"
-                                                                      :clearable="true"
+                                                                      :clearable="false"
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[2].disabled"
                                                                       :buttonIf="false"
@@ -182,7 +181,7 @@
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
                                                                   size="small" autocomplete="off"
                                                                   :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  clearable :placeholder="item[2].text || ''" ></el-input>
+                                                                  :placeholder="item[2].text || ''" ></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                             </el-row>
@@ -198,7 +197,7 @@
                                                               :datalist="item.dicData"
                                                               :selectValue="form[item.prop]"
                                                               :filterable="true"
-                                                              :clearable="true"
+                                                              :clearable="false"
                                                               :remote="true"
                                                               :disabled="detailData.seeDisabled || item.disabled"
                                                               :buttonIf="item.buttonIf"
@@ -218,7 +217,7 @@
                                                 <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
                                                           size="small" autocomplete="off"
                                                           :disabled="detailData.seeDisabled || item.disabled"
-                                                          clearable :placeholder="item.text || ''" ></el-input>
+                                                          :placeholder="item.text || ''" ></el-input>
                                             </el-form-item>
                                         </div>
                                     </el-col>
@@ -429,11 +428,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 label: "客户OP", // 客户联系人姓名 电话和邮箱带出来,可以修改 往来单位接口 需要传一个客户名称的值过去
                                 prop: "corpAttnName",
                                 text:"姓名",
-                                allowCreate:true,
                                 type:'select',
                                 dicData:[],
                                 span:10,
                                 disabled:true,
+                                clearable: false,
                                 forParameter:{
                                     key:'id',
                                     label:'cname',
@@ -446,6 +445,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 text:"电话",
                                 labelWidth:'10px',
                                 disabled:true,
+                                clearable: false,
                                 span:7,
                                 // rules: [{
                                 //     required: true,
@@ -459,6 +459,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 text:"邮箱",
                                 labelWidth:'10px',
                                 disabled:true,
+                                clearable: false,
                                 span:7,
                                 // rules: [{
                                 //     required: true,
@@ -617,6 +618,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 type:'tree',
                                 dicData:[],
                                 disabled:false,
+                                clearable: false,
                                 forParameter:{
                                     label: "title",
                                     children:'children'
@@ -765,7 +767,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             }
         },
         created() {
-            console.log(JSON.parse(localStorage.getItem('saber-tenantId')))
             let Obj=JSON.parse(localStorage.getItem('saber-tenantId'))
             this.saberTenantId = Obj?Obj.content:0;
             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
@@ -1599,7 +1600,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     }
                 })
                 this.pageLoading = true
-                console.log(this.form)
                 billsSubmit(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message({
@@ -1699,7 +1699,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 this.$set(this, 'form', res.data.data)
               //   console.log('form', this.form)
               // console.log(this.$refs)
-              //   this.$refs.filescenter.onload()
+              
                 this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
@@ -1791,6 +1791,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     item.edit = false
                 }
                 // 文件中心
+                this.$refs.filescenter.getData(res.data.data)
                 for(let item of this.form.filesList) {
                     this.$set(item,'edit',false)
                 }

+ 2 - 1
src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -114,7 +114,8 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="制单日期" prop="createTime">
-                                <el-date-picker v-model="form.createTime" clearable
+                                <el-date-picker v-model="form.createTime" 
+                                                :clearable="false"
                                                 style="width: 100%;"
                                                 type="date" size="small"
                                                 value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 1
src/views/iosBasicData/psBcorps/detailsPage.vue

@@ -1292,7 +1292,7 @@ export default {
       this.rateOptions = res.data.data.records
     })
     // 获取客户类别
-    bcorpstypedefineList(1, 9999,{cnName:'PS 客户'}).then(res => {
+    bcorpstypedefineList(1, 9999,{cnName:'PS客户'}).then(res => {
       this.customTypeData = res.data.data.records
     })
     // 查询用户信息

+ 1 - 1
src/views/iosBasicData/psBcorps/index.vue

@@ -589,7 +589,7 @@ export default {
     },
     // 获取客户类别
     bcorpstypedefineListfun() {
-      bcorpstypedefineList(1,30,{cnName:'PS 客户'}).then(res => {
+      bcorpstypedefineList(1,30,{cnName:'PS客户'}).then(res => {
         this.customTypeData = res.data.data.records
       })
     },

+ 2 - 1
src/views/iosBasicData/seamends/amendsDetails.vue

@@ -122,7 +122,8 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="制单日期" prop="createTime">
-                                <el-date-picker v-model="form.createTime" clearable
+                                <el-date-picker v-model="form.createTime" 
+                                                :clearable="false"
                                                 style="width: 100%;"
                                                 type="date" size="small"
                                                 value-format="yyyy-MM-dd HH:mm:ss"

+ 2 - 3
src/views/iosBasicData/siamends/amendsDetails.vue

@@ -106,7 +106,8 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="制单日期" prop="createTime">
-                                <el-date-picker v-model="form.createTime" clearable
+                                <el-date-picker v-model="form.createTime" 
+                                                :clearable="false"
                                                 style="width: 100%;"
                                                 type="date" size="small"
                                                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -1214,8 +1215,6 @@ export default {
         },
         // 预览报表
         handleReportPreview(url,data){
-            console.log(url,1670)
-            console.log(data,1671)
             Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
             // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='
             Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile( '/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')