进口优化

src/components/fee-info/main.vue

@@ -612,7 +612,7 @@ export default {
             itemsList : this.selectionList
           }
           if(type === '申请'){
-            this.$confirm("您确定申请货款吗？", "提示", {
+            this.$confirm("您确定申请付费吗？", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",

src/components/finance/applyPayment.vue

@@ -84,6 +84,9 @@ export default {
       type: Array,
       default: []
     },
+    itemType:{
+      type: String
+    },
     billUrl:{
       type: String
     }
@@ -349,10 +352,12 @@ export default {
       if (result.some(item => item)) {
         const itemsList = this.list.map(item => {
           item.form.corpId = this.corpId;
+          item.tradeType = this.billData.optionType
           return item.form
         })
 
             const params = {
+              itemType:this.itemType,
               billType : this.billType,
               url:this.billUrl,
               DC : this.billData.itemType === "采购"?"C":"D",     //账单明细会根据D C区分采购 销售搜索

src/components/goodsSelect/index.vue

@@ -177,7 +177,6 @@ export default {
     //确认导出触发
     confirmSelection() {
       this.dicData = []
-      console.log(this.selection)
       if (this.configuration.multipleChoices === true) {
         let value = []
         for (let item in this.selection) {

src/page/index/top/top-notice.vue

@@ -62,7 +62,7 @@ export default {
     //初始化
     init(){
       getMsgLogs().then(res=>{
-        this.afterData(res.data.data.records)
+        this.afterData(res.data.data)
       })
       if(typeof(WebSocket) === "undefined"){
         alert("您的浏览器不支持socket")
@@ -86,7 +86,6 @@ export default {
     },
     getMessage(msg){
       let msgData = JSON.parse(msg);
-      console.log(msgData.data.unRead)
       if(msgData.data.unRead){
         this.badge = msgData.data.unReadNum
       }else{

src/views/financialManagement/paymentRequest/configuration/detailsPage.json

@@ -17,7 +17,7 @@
   "border": true,
   "index": true,
   "selection": false,
-  "menuWidth": 180,
+  "menuWidth": 150,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",

src/views/financialManagement/paymentRequest/index.vue

@@ -31,12 +31,14 @@
         <el-button
           type="text"
           size="small"
+          icon="el-icon-edit"
           @click.stop="editOpen(scope.row, 2)"
         >编辑
         </el-button>
         <el-button
           type="text"
           size="small"
+          icon="el-icon-delete"
           :disabled="scope.row.checkStatus == '审核中' ||  scope.row.checkStatus == '请核成功'"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -115,6 +115,7 @@
             <el-button
               type="text"
               size="small"
+              icon="el-icon-edit"
               :disabled="checkDisabled || auditDisabled"
               @click="rowCell(scope.row,scope.index)"
             >{{ scope.row.$cellEdit ? '修改完成' : '修改' }}
@@ -122,6 +123,7 @@
             <el-button
               type="text"
               size="small"
+              icon="el-icon-delete"
               :disabled="checkDisabled || auditDisabled"
               @click.stop="rowDel(scope.row,scope.index)"
             >删除

src/views/financialManagement/paymentSettle/configuration/detailsPage.json

@@ -17,7 +17,7 @@
   "border": true,
   "index": true,
   "selection": false,
-  "menuWidth": 220,
+  "menuWidth": 150,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -36,12 +36,14 @@
         <el-button
           type="text"
           size="small"
+          icon="el-icon-edit"
           @click.stop="editOpen(scope.row, 2)"
         >编辑
         </el-button>
         <el-button
           type="text"
           size="small"
+          icon="el-icon-delete"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -68,6 +68,7 @@
             <el-button type="primary"
                        size="small"
                        icon="el-icon-shopping-cart-2"
+                       :disabled="!financeDisabled"
                        @click="selectPurchase">选择采购合同
             </el-button>
           </template>
@@ -75,12 +76,16 @@
             <el-button
               type="text"
               size="small"
+              icon="el-icon-edit"
+              :disabled="!financeDisabled"
               @click.stop="rowCell(scope.row,scope.index)"
             > {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
             <el-button
               type="text"
               size="small"
+              :disabled="!financeDisabled"
+              icon="el-icon-delete"
               @click.stop="rowDel(scope.row,scope.index)"
             >删除
             </el-button>
@@ -432,7 +437,7 @@
         done(row);
       },
       rowCell(row,index){
-        this.$refs.crud.rowCell(row, index)
+        row.$cellEdit = !row.$cellEdit
       },
       rowDel(row,index){
         this.dataList.splice(index, 1);

src/views/financialManagement/receiptSettle/configuration/detailsPage.json

@@ -17,7 +17,7 @@
   "border": true,
   "index": true,
   "selection": false,
-  "menuWidth": 180,
+  "menuWidth": 150,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -36,12 +36,14 @@
         <el-button
           type="text"
           size="small"
+          icon="el-icon-edit"
           @click.stop="editOpen(scope.row, 2)"
         >编辑
         </el-button>
         <el-button
           type="text"
           size="small"
+          icon="el-icon-delete"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -86,7 +86,6 @@
               placeholder="请输入"
               size="small"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
-              @change="thisAmountChange(row)"
             ></el-input>
             <span v-else>{{ row.thisAmount }}</span>
           </template>
@@ -94,6 +93,7 @@
             <el-button
               type="text"
               size="small"
+              icon="el-icon-edit"
               :disabled="!financeDisabled"
               @click.stop="rowCell(scope.row,scope.index)"
             > {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
@@ -101,6 +101,7 @@
             <el-button
               type="text"
               size="small"
+              icon="el-icon-delete"
               :disabled="!financeDisabled"
               @click.stop="rowDel(scope.row,scope.index)"
             >删除
@@ -405,8 +406,8 @@
           item.accId = item.id;
           item.srcOrderno  = item.accSysNo
           item.billNo  = item.srcBillNo
-          item.thisAmount = _.subtract(item.amount, item.settlementAmount)
-          item.maxThisAmount = item.thisAmount
+          // item.thisAmount = _.subtract(item.amount, item.settlementAmount)
+          // item.maxThisAmount = item.thisAmount
           delete item.id;
           this.$refs.crud.rowCellAdd(item);
         })
@@ -416,14 +417,12 @@
         // this.form.srcOrderno = this.dataList.map(item =>{return item.srcOrderno}).join(",")
         this.billDetailDialog = false;
       },
-      thisAmountChange(row){
-        console.log(row.thisAmount)
-        console.log(row.maxThisAmount)
-        if(row.thisAmount > row.maxThisAmount){
-          this.$message.error("本次结算金额不能大于剩余结算金额!")
-          row.thisAmount = 0;
-        }
-      },
+      // thisAmountChange(row){
+        // if(row.thisAmount > row.maxThisAmount){
+        //   this.$message.error("本次结算金额不能大于剩余结算金额!")
+        //   row.thisAmount = 0;
+        // }
+      // },
       rowUpdate(row, index, done) {
         done(row);
       },

src/views/importTrade/invoice/config/customerContact.json

@@ -17,7 +17,7 @@
   "border": true,
   "index": true,
   "selection": true,
-  "menuWidth": 180,
+  "menuWidth": 150,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",

src/views/importTrade/invoice/config/mainList.json

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 130,
   "searchIcon": true,
   "searchIndex": 2,
   "addBtnText": "创建单据",

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -47,14 +47,19 @@
           <el-row>
             <el-col v-for="(item,index) in basicData.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]" :disabled="item.disabled?true:false || goodsDisable" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
-<!--                <warehouse-select  v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" :configuration="sConfiguration"></warehouse-select>-->
-                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="item.disabled?true:false || goodsDisable"  @change="warehouseChange" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="item.disabled?true:false || goodsDisable || viewDisabled" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  corpType="GYS"
+                  :disabled="viewDisabled"
+                  style="width: 100%"
+                ></crop-select>
+                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="item.disabled?true:false || goodsDisable || viewDisabled"  @change="warehouseChange" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in storageList" :key="index" :label="item.stockName" :value="item.storageId"></el-option>
                 </el-select>
-                <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" :disabled="item.disabled?true:false || goodsDisable" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || goodsDisable" placeholder="请输入"  size="small" autocomplete="off"></el-input>
+                <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" :disabled="item.disabled?true:false || goodsDisable || viewDisabled" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || goodsDisable || viewDisabled" placeholder="请输入"  size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -193,29 +198,6 @@
               </el-select>
               <span v-else>{{ row.cntrNo }}</span>
             </template>
-<!--            <template slot="currency" slot-scope="{ row }">-->
-<!--              <el-select v-model="row.currency"-->
-<!--                         v-if="row.$cellEdit"-->
-<!--                         size="small"-->
-<!--                         placeholder="请选择 币别"-->
-<!--                         @change="currencyChange(row)"-->
-<!--                         clearable filterable>-->
-<!--                <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>-->
-<!--              </el-select>-->
-<!--              <span v-else>{{ row.currency }}</span>-->
-<!--            </template>-->
-<!--            <template slot="taxRate" slot-scope="{ row }">-->
-<!--              <el-input-->
-<!--                v-if="row.$cellEdit"-->
-<!--                v-model="row.taxRate"-->
-<!--                size="small"-->
-<!--                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'-->
-<!--                autocomplete="off"-->
-<!--              >-->
-<!--                <i slot="suffix" style="margin-top:3px;margin-right: 10px;display:inline-block">%</i>-->
-<!--              </el-input>-->
-<!--              <span v-else>{{ row.taxRate | isPercentage}}</span>-->
-<!--            </template>-->
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                 type="text"
@@ -338,15 +320,6 @@ export default {
       cntrNoList:[],
       storageList:[],
       selectKind: -1,
-      configuration: {
-        multipleChoices: false,
-        multiple: false,
-        disabled: false,
-        searchShow: true,
-        collapseTags: false,
-        placeholder: '请点击右边按钮选择',
-        dicData: []
-      },
       sConfiguration: {
         multipleChoices: false,
         multiple: false,
@@ -530,7 +503,6 @@ export default {
         this.form = res.data.data;
         this.oldForm = Object.assign({}, res.data.data);
         this.goodsDisable = res.data.data.deliveryStatus === "已发货" ? true : false
-        this.configuration.dicData = this.form.corpName
         if (this.form.deliveryItemsList) {
           this.contactsData = this.form.deliveryItemsList
           this.oldContactsData = this.deepClone(this.form.deliveryItemsList)
@@ -757,18 +729,18 @@ export default {
         item.srcId = item.id;
         getListOrgOrderNo(item.billNo,item.contractNumber,item.priceCategory).then(res => {
           this.creditList = res.data
-          this.storageList = this.creditList.map(item =>{
+            this.creditList.map(item =>{
             let params ={
               storageId:item.storageId,
               stockName:item.stockName
             }
-            return params
+             this.storageList.push(params)
           })
-          this.cntrNoList = this.creditList.map(item =>{
+          this.creditList.map(item =>{
             let params ={
               cntrNo:item.cntrNo,
             }
-            return params
+            this.cntrNoList.push(params)
           })
         })
         this.selectInventory(item);

src/views/importTrade/receipt/config/customerContact.json

@@ -18,7 +18,7 @@
   "index": true,
   "selectionFixed": false,
   "selection": true,
-  "menuWidth": 220,
+  "menuWidth": 150,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [

src/views/importTrade/receipt/config/mainList.json

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 130,
   "searchIcon": true,
   "searchIndex": 2,
   "addBtnText": "创建单据",

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -47,14 +47,20 @@
           <el-row>
             <el-col v-for="(item,index) in basicData.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]" :disabled="receiptDisable" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <selectComponent v-else-if="item.prop === 'corpId'" :disabled="receiptDisable" v-model="form[item.prop]" :configuration="configuration"/>
-                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="receiptDisable" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="receiptDisable || viewDisabled" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  corpType="GYS"
+                  :disabled="viewDisabled"
+                  style="width: 100%"
+                ></crop-select>
+                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="receiptDisable || viewDisabled" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in storageIdDic" :key="index" :label="item.cname" :value="item.id"></el-option>
                 </el-select>
 <!--                <warehouse-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" @change="warehouseChange" :configuration="configuration" />-->
-                <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" v-model="form[item.prop]"  :disabled="receiptDisable" size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false || receiptDisable" placeholder="请输入" autocomplete="off"></el-input>
+                <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" v-model="form[item.prop]"  :disabled="receiptDisable || viewDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false || receiptDisable || viewDisabled" placeholder="请输入" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -191,12 +197,14 @@
               <el-button
                 type="text"
                 size="small"
+                icon="el-icon-edit"
                 :disabled="receiptDisable  || viewDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
               <el-button
                 type="text"
+                icon="el-icon-delete"
                 size="small"
                 :disabled="receiptDisable  || viewDisabled"
                 @click="rowDel(row,index)"
@@ -300,15 +308,6 @@ export default {
       currencyDic:[],
       singleton:[],
       selectKind:-1,
-      configuration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
-      },
       itemConfiguration:{
         multipleChoices:false,
         multiple:false,
@@ -496,8 +495,6 @@ export default {
         this.form = res.data.data;
         this.oldForm = Object.assign({},res.data.data);
         this.receiptDisable = res.data.data.deliveryStatus === "已收货" ?   true :false
-        this.configuration.disabled = this.receiptDisable
-        this.configuration.dicData = this.form.corpName
         if(this.form.deliveryItemsList){
           this.contactsData = this.form.deliveryItemsList
           this.oldContactsData = this.deepClone(this.form.deliveryItemsList)

src/views/purchase/contract/config/customerContact.json

@@ -17,7 +17,7 @@
   "border": true,
   "index": true,
   "selection": true,
-  "menuWidth": 180,
+  "menuWidth": 150,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",

src/views/purchase/contract/config/mainList.json

@@ -23,7 +23,7 @@
   "addBtnText": "创建单据",
   "expand": true,
   "expandWidth": 38,
-  "selectionWidth": 40,
+  "selectionWidth": 50,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [

src/views/purchase/contract/detailsPage.vue

@@ -42,28 +42,6 @@
           </el-dropdown-menu>
         </el-dropdown>
 
-
-<!--        <el-button type="warning"-->
-<!--                   size="small"-->
-<!--                   class="el-button&#45;&#45;small-yh "-->
-<!--                   :loading="buttonLoading"-->
-<!--                   :disabled="!form.id || viewDisabled"-->
-<!--                   @click.stop="applyPayment('申请')">申请货款-->
-<!--        </el-button>-->
-<!--        <el-button type="info"-->
-<!--                   size="small"-->
-<!--                   :loading="buttonLoading"-->
-<!--                   :disabled="!form.id  || viewDisabled"-->
-<!--                   @click="openApplicationDialog"-->
-<!--        >查看付款记录-->
-<!--        </el-button>-->
-<!--        <el-button type="warning"-->
-<!--                   size="small"-->
-<!--                   class="el-button&#45;&#45;small-yh "-->
-<!--                   :loading="buttonLoading"-->
-<!--                   :disabled="!form.id  || viewDisabled"-->
-<!--                   @click.stop="applyPayment('收费')">退款-->
-<!--        </el-button>-->
         <el-button type="success"
                    size="small"
                    :loading="buttonLoading"
@@ -90,7 +68,7 @@
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:8" :key="index">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-date-picker v-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]" :disabled="item.disabled?true:false" size="small" type="date" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-date-picker v-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]" :disabled="item.disabled?true:false || viewDisabled" size="small" type="date" @change="dateChange" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <el-select v-else-if="item.type === 'select'" style="width: 100%" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option
                     v-for="(data, index) in item.dicData"
@@ -99,29 +77,48 @@
                     :value="data.value"
                   ></el-option>
                 </el-select>
-                <el-input type="age" v-else-if="item.prop === 'orderAmount'" v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off" @input="RMBChange" placeholder="请输入"></el-input>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" :configuration="configuration"/>
-                <selectComponent v-else-if="item.prop === 'purchaserId'" v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" :configuration="pConfiguration"/>
-                <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" :configuration="bConfiguration"/>
-                <el-select v-else-if="item.prop === 'orderType'"  style="width: 100%"  v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" size="small" placeholder="请选择" clearable filterable>
+                <el-input type="age" v-else-if="item.prop === 'orderAmount'" v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled || viewDisabled" size="small" autocomplete="off" @input="RMBChange" placeholder="请输入"></el-input>
+
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  corpType="GYS"
+                  :disabled="item.disabled? true:false || takeDisabled || viewDisabled"
+                  style="width: 100%"
+                ></crop-select>
+                <crop-select
+                  v-else-if="item.prop === 'purchaserId'"
+                  v-model="form[item.prop]"
+                  corpType="KH"
+                  :disabled="item.disabled? true:false || takeDisabled || viewDisabled"
+                  style="width: 100%"
+                ></crop-select>
+                <crop-select
+                  v-else-if="item.prop === 'belongToCorpId'"
+                  v-model="form[item.prop]"
+                  :disabled="item.disabled? true:false || takeDisabled || viewDisabled"
+                  corpType="GS"
+                ></crop-select>
+
+                <el-select v-else-if="item.prop === 'orderType'"  style="width: 100%"  v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled || viewDisabled" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in contractTypeDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
-                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"  :disabled="item.disabled?true:false || takeDisabled"  v-model="form[item.prop]" size="small" placeholder="请选择" @change="currencyChange" clearable filterable>
+                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"  :disabled="item.disabled?true:false || takeDisabled  || viewDisabled"  v-model="form[item.prop]" size="small" placeholder="请选择" @change="currencyChange" clearable filterable>
                   <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
                 </el-select>
-                <el-select v-else-if="item.prop === 'paymentType'"  style="width: 100%"  v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
+                <el-select v-else-if="item.prop === 'paymentType'"  style="width: 100%" :disabled="item.disabled?true:false  || viewDisabled" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in paymentTypeDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
                 <div v-else-if="item.prop === 'advancePayment'">
-                  <el-input type="age" v-model="form[item.prop]" style="width: 70%" :disabled="item.disabled?true:false || takeDisabled"  size="small" autocomplete="off" placeholder="请输入"></el-input>
-                  <el-select v-model="form['prepayCurrency']" size="small" style="width: 30%"  :disabled="item.disabled?true:false || takeDisabled" value="USD"   placeholder="请选择" clearable filterable>
+                  <el-input type="age" v-model="form[item.prop]" style="width: 70%" :disabled="item.disabled?true:false || takeDisabled  || viewDisabled"  size="small" autocomplete="off" placeholder="请输入"></el-input>
+                  <el-select v-model="form['prepayCurrency']" size="small" style="width: 30%"  :disabled="item.disabled?true:false || takeDisabled  || viewDisabled" value="USD"   placeholder="请选择" clearable filterable>
                     <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
                   </el-select>
                 </div>
-                <el-input type="age" v-else-if="item.prop === 'exchangeRate'" v-model="form[item.prop]"  :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off"  @change="RMBChange" placeholder="请输入">
+                <el-input type="age" v-else-if="item.prop === 'exchangeRate'" v-model="form[item.prop]"  :disabled="item.disabled?true:false || takeDisabled  || viewDisabled" size="small" autocomplete="off"  @change="RMBChange" placeholder="请输入">
                 </el-input>
-                <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]" :disabled="viewDisabled"  size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled  || viewDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -257,12 +254,14 @@
               <el-button
                 type="text"
                 size="small"
+                icon="el-icon-edit"
                 :disabled="row.actualQuantity !=0  || viewDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
               <el-button
                 type="text"
+                icon="el-icon-delete"
                 size="small"
                 :disabled="row.actualQuantity !=0 || viewDisabled"
                 @click="rowDel(row,index)"
@@ -336,6 +335,7 @@
       <apply-payment
         :billUrl="billUrl"
         :billType="billType"
+        :itemType="'采购'"
         :billData="billData"
         @choceFun="choceFun"
       >
@@ -395,7 +395,7 @@ export default {
       applicationDialog:false,
       commodityData: false,
       takeDisabled:false, //收货状态
-      viewDisabled:false,
+      viewDisabled:false,//查看状态
       tableData: [],
       billUrl:"/financialManagement/paymentRequest/index",
       billType:"",
@@ -408,33 +408,6 @@ export default {
       orderFeesList:[],
       orderFilesList:[],
       treeDeptId: '',
-      configuration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
-      },
-      pConfiguration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
-      },
-      bConfiguration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
-      },
       itemConfiguration:{
         multipleChoices:false,
         multiple:false,
@@ -821,11 +794,19 @@ export default {
     }
   },
   methods: {
+    //选择货品物种
     valueName(value,row){
       this.itemTypeList = value.list
       this.$set(row,"priceCategory",value.id)
       this.$set(row,"itemId",value.id)   //将id 赋值给itemId  提单号查询合同号时使用
     },
+    //到货日期不能小于发货日期
+    dateChange(){
+      if(this.form.requiredArrivalDate && this.form.requiredDeliveryDate &&this.form.requiredArrivalDate < this.form.requiredDeliveryDate ){
+       this.$message.error("到货日期不能小于发货日期")
+        this.$set(this.form,"requiredArrivalDate",'')
+      }
+    },
     //单价
     priceChange(row) {
       if (row.price && row.billWeight) {
@@ -989,8 +970,6 @@ export default {
     //回调
     afterEcho(form){
       this.oldForm = Object.assign({},form);
-      this.configuration.dicData = this.form.corpsName
-      this.pConfiguration.dicData = this.form.purchaserName
       if(form.itemsVOList){
         this.contactsData = form.itemsVOList
         this.oldContactsData = this.deepClone(form.itemsVOList)

src/views/purchase/contract/index.vue

@@ -30,7 +30,7 @@
         </template>
         <template slot-scope="scope" slot="expand">
           <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
-            <el-table-column   type="selection" align="center"  width="40"></el-table-column>
+            <el-table-column   type="selection" align="center"  width="50"></el-table-column>
             <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="150"></el-table-column>
             <el-table-column  label="货物品种" prop="priceCategoryNames" align="center" show-overflow-tooltip width="180"></el-table-column>
             <el-table-column  label="规格" prop="itemType" align="center" show-overflow-tooltip width="140"></el-table-column>

src/views/salesManagement/salesContract/config/importInventory.json

@@ -17,7 +17,7 @@
   "index": true,
   "refreshBtn": false,
   "selection": true,
-  "menuWidth": 180,
+  "menuWidth": 150,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",

src/views/salesManagement/salesContract/config/mainList.json

@@ -14,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 130,
   "align": "center",
   "dialogClickModal": false,
   "searchLabelWidth": 120,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -88,8 +88,8 @@
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:8" :key="index">
               <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="date" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <el-select v-else-if="item.type === 'select'" style="width: 100%" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="viewDisabled" size="small" type="date" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-select v-else-if="item.type === 'select'" style="width: 100%" v-model="form[item.prop]" :disabled="viewDisabled" size="small" placeholder="请选择" clearable filterable>
                   <el-option
                     v-for="(data, index) in item.dicData"
                     :key="index"
@@ -97,16 +97,27 @@
                     :value="data.value"
                   ></el-option>
                 </el-select>
-                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"   v-model="form[item.prop]" size="small" placeholder="请选择" @change="currencyChange" clearable filterable>
-                  <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
+                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"   v-model="form[item.prop]" :disabled="viewDisabled" size="small" placeholder="请选择" @change="currencyChange" clearable filterable>
+                  <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue" :disabled="viewDisabled" :value="item.dictValue"></el-option>
                 </el-select>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
-                <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :configuration="bConfiguration"/>
-                <el-input type="age" v-else-if="item.type === 'unit'" v-model="form[item.prop]"  @change="downPaymentChange"  :disabled="item.disabled?true:false" size="small" autocomplete="off" placeholder="请输入">
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  corpType="KH"
+                  :disabled="item.disabled? true:false || viewDisabled"
+                  style="width: 100%"
+                ></crop-select>
+                <crop-select
+                  v-else-if="item.prop === 'belongToCorpId'"
+                  v-model="form[item.prop]"
+                  :disabled="item.disabled? true:false || viewDisabled"
+                  corpType="GS"
+                ></crop-select>
+                <el-input type="age" v-else-if="item.type === 'unit'" v-model="form[item.prop]"  @change="downPaymentChange"  :disabled="item.disabled?true:false || viewDisabled" size="small" autocomplete="off" placeholder="请输入">
                   <template slot="append">%</template>
                 </el-input>
-                <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]" :disabled="viewDisabled"  size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false || viewDisabled" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -271,6 +282,7 @@
               <el-button
                 type="text"
                 size="small"
+                icon="el-icon-edit"
                 :disabled="  viewDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '修改完成' : '修改' }}
@@ -278,6 +290,7 @@
               <el-button
                 type="text"
                 size="small"
+                icon="el-icon-delete"
                 :disabled="  viewDisabled"
                 @click="rowDelList(row,index)"
               >删除
@@ -336,6 +349,7 @@
     >
       <apply-payment
         :billUrl="billUrl"
+        :itemType="'销售'"
         :billType="billType"
         :billData="billData"
         @choceFun="choceFun"
@@ -425,24 +439,6 @@ export default {
       billUrl:"",
       billType:"",
       billData:{},
-      configuration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
-      },
-      bConfiguration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
-      },
       itemConfiguration:{
         multipleChoices:false,
         multiple:false,
@@ -810,7 +806,6 @@ export default {
       detailSaleList(id).then(res => {
         this.form = res.data.data;
         this.oldForm = Object.assign({},res.data.data);
-        this.configuration.dicData = this.form.corpName
         // this.bConfiguration.dicData = this.form.belongToCorpList
         if(this.form.orderItemsList){
           this.importInventoryData = this.form.orderItemsList
@@ -892,6 +887,7 @@ export default {
       this.billData = {
         srcOrderno:this.form.orderNo,
         itemType:"销售",
+        optionType:'JK',
         billNoList: this.importInventoryData.map(item =>{return item.billNo}),
         corpsName:this.form.corpName,
         corpId:this.form.corpId,
@@ -1041,7 +1037,6 @@ export default {
               detailSaleList(res.data.data.id).then(res => {
                 this.form = res.data.data;
                 this.oldForm = Object.assign({},res.data.data);
-                this.configuration.dicData = this.form.corpName
                 // this.bConfiguration.dicData = this.form.belongToCorpList
                 this.importInventoryData = this.form.orderItemsList
                 if(this.form.orderItemsList){