Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/components/crop-select/main.vue

@@ -28,7 +28,7 @@
       </span>
       <el-button icon="el-icon-search" size="mini" v-if="label != 'shortName'" :disabled="disabled"
         @click="openDialog()"></el-button>
-      <el-tooltip effect="dark" content="获取最新资料" placement="top-start">
+      <el-tooltip v-if="refresh" effect="dark" content="获取最新资料" placement="top-start">
         <el-button icon="el-icon-refresh" size="mini" v-if="label != 'shortName'" @click="refreshData"
           style="margin-left:0px;"></el-button>
       </el-tooltip>
@@ -118,6 +118,10 @@ export default {
     label: String,
     belongtocompany: Number,
     zhKey: Boolean,
+    refresh: {
+      type: Boolean,
+      default: true
+    },
   },
   model: {
     prop: "value",

src/enums/column-name.js

@@ -792,6 +792,18 @@ const columnName = [{
 }, {
   code: 187,
   name: '橡胶库存-列表页'
+}, {
+  code: 188,
+  name: '采购管理-入库列表页'
+}, {
+  code: 189,
+  name: '采购管理-入库明细表'
+}, {
+  code: 190,
+  name: '销售管理-出库列表页'
+}, {
+  code: 191,
+  name: '销售管理-出库明细表'
 }
 ]
 export const getColumnName = (key) => {

src/views/purchase/contract/detailsPage.vue

@@ -149,7 +149,7 @@
               <goods-select style="width:90% !important;" v-if="row.$cellEdit" v-model="row.priceCategoryNames"
                 @valueName="(value) => valueName(value, row)" :configuration="itemConfiguration">
               </goods-select>
-              <span v-else>{{  row.priceCategoryNames  }}</span>
+              <span v-else>{{ row.priceCategoryNames }}</span>
             </template>
             <template slot="itemType" slot-scope="{ row, index }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -158,7 +158,7 @@
                 <el-option v-for="(item, index) in itemTypeList" :key="index" :label="item" :value="item">
                 </el-option>
               </el-select>
-              <span v-else>{{  row.itemType  }}</span>
+              <span v-else>{{ row.itemType }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -166,14 +166,14 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{  row.orderQuantity | roundNumbers  }}</span>
+              <span v-else>{{ row.orderQuantity | roundNumbers }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.price" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
               <!--              @input="priceChange(row)"-->
-              <span v-else>{{  row.price  }}</span>
+              <span v-else>{{ row.price }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -181,7 +181,7 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.invoiceWeight)"></el-input>
-              <span v-else>{{  row.invoiceWeight  }}</span>
+              <span v-else>{{ row.invoiceWeight }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
               <el-input style="width:90% !important;" v-if="row.$cellEdit" v-model="row.billWeight" placeholder="请输入"
@@ -189,19 +189,19 @@
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.billWeight)"></el-input>
               <!--              @input="billWeightChange(row)"-->
-              <span v-else>{{  row.billWeight  }}</span>
+              <span v-else>{{ row.billWeight }}</span>
             </template>
             <template slot="grossWeight" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.grossWeight" style="width: 90%" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{  row.grossWeight  }}</span>
+              <span v-else>{{ row.grossWeight }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.amount" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{  row.amount  }}</span>
+              <span v-else>{{ row.amount }}</span>
             </template>
             <template slot="taxRate" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.taxRate" size="small"
@@ -209,14 +209,14 @@
                 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>
+              <span v-else>{{ row.taxRate | isPercentage }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
-              <span>{{  row.actualQuantity | roundNumbers  }}</span>
+              <span>{{ row.actualQuantity | roundNumbers }}</span>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button type="text" size="small" icon="el-icon-edit"
-                :disabled="row.actualQuantity != 0 || viewDisabled" @click="rowCell(row, index)">{{  row.$cellEdit ?
+                :disabled="row.actualQuantity != 0 || viewDisabled" @click="rowCell(row, index)">{{ row.$cellEdit ?
                 '修改完成' : '修改'
 
                 }}
@@ -383,9 +383,10 @@ export default {
       basicData: {
         column: [
           {
-            label: '系统编号',
-            prop: 'sysNo',
-            disabled: true,
+            label: '合同类型',
+            prop: 'orderType',
+            // type:'select',
+            dicData: [],
             rules: [
               {
                 required: false,
@@ -393,7 +394,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },
+          {
             label: '供应商',
             prop: 'corpId',
             span: 16,
@@ -464,10 +466,9 @@ export default {
             ]
           },
           {
-            label: '合同类型',
-            prop: 'orderType',
-            // type:'select',
-            dicData: [],
+            label: '系统编号',
+            prop: 'sysNo',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -475,7 +476,7 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },
+          }, 
           {
             label: '要求发货日期',
             prop: 'requiredDeliveryDate',

src/views/salesManagement/salesContract/detailsPage.vue

@@ -97,15 +97,22 @@
                 </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-select v-else-if="item.prop === 'orderType'" style="width: 100%" v-model="form[item.prop]"
+                  :disabled="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-input type="age" v-else v-model="form[item.prop]" size="small"
                   :disabled="item.disabled ? true : false || viewDisabled" autocomplete="off" placeholder="请输入">
                 </el-input>
+
                 <template slot="label" v-if="item.prop === 'corpId'">
                   <e-crop-jump :label="item.label" corp-type="KH"></e-crop-jump>
                 </template>
                 <template slot="label" v-if="item.prop === 'belongToCorpId'">
                   <e-crop-jump :label="item.label" corp-type="GS"></e-crop-jump>
                 </template>
+
               </el-form-item>
             </el-col>
           </el-row>
@@ -125,7 +132,7 @@
                 <el-option v-for="(item, index) in listByBillNo" :key="index" :label="item.billNo" :value="item.billNo">
                 </el-option>
               </el-select>
-              <span v-else>{{  row.billNo  }}</span>
+              <span v-else>{{ row.billNo }}</span>
             </template>
             <template slot-scope="{row}" slot="orgOrderNo">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -135,14 +142,14 @@
                   :value="item.orderNo">
                 </el-option>
               </el-select>
-              <span v-else>{{  row.orgOrderNo  }}</span>
+              <span v-else>{{ row.orgOrderNo }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.price" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
               <!--              @input="priceChange(row)"-->
-              <span v-else>{{  row.price  }}</span>
+              <span v-else>{{ row.price }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -150,14 +157,14 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{  row.orderQuantity | roundNumbers  }}</span>
+              <span v-else>{{ row.orderQuantity | roundNumbers }}</span>
             </template>
             <template slot="priceCategory" slot-scope="{row,index}">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
               <goods-select style="width:90% !important;" v-if="row.$cellEdit" v-model="row.priceCategoryNames"
                 @valueName="(value) => valueName(value, row)" :configuration="itemConfiguration">
               </goods-select>
-              <span v-else>{{  row.priceCategoryNames  }}</span>
+              <span v-else>{{ row.priceCategoryNames }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -165,26 +172,26 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.invoiceWeight)"></el-input>
-              <span v-else>{{  row.invoiceWeight  }}</span>
+              <span v-else>{{ row.invoiceWeight }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.billWeight" placeholder="请输入" style="width: 90%" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.billWeight)"></el-input>
               <!--              @input="billWeightChange(row)"-->
-              <span v-else>{{  row.billWeight  }}</span>
+              <span v-else>{{ row.billWeight }}</span>
             </template>
             <template slot="grossWeight" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.grossWeight" style="width: 90%" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{  row.grossWeight  }}</span>
+              <span v-else>{{ row.grossWeight }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.amount" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{  row.amount  }}</span>
+              <span v-else>{{ row.amount }}</span>
             </template>
             <template slot="taxRate" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.taxRate" size="small"
@@ -192,10 +199,10 @@
                 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>
+              <span v-else>{{ row.taxRate | isPercentage }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
-              <span>{{  row.actualQuantity | roundNumbers  }}</span>
+              <span>{{ row.actualQuantity | roundNumbers }}</span>
             </template>
             <template slot="menuLeft" slot-scope="{ row }">
               <el-button type="primary" icon="el-icon-plus" size="small" :disabled="viewDisabled"
@@ -215,7 +222,7 @@
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button type="text" size="small" icon="el-icon-edit" :disabled="viewDisabled"
-                @click="rowCell(row, index)">{{  row.$cellEdit ? '修改完成' : '修改'  }}
+                @click="rowCell(row, index)">{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
               <el-button type="text" size="small" icon="el-icon-delete" :disabled="viewDisabled"
                 @click="rowDelList(row, index)">删除
@@ -321,6 +328,7 @@ export default {
   },
   data() {
     return {
+      contractTypeDic: [],
       disabled: false,
       buttonLoading: false,
       dialogCommodity: false,
@@ -357,10 +365,12 @@ export default {
       //  基础信息
       basicData: {
         column: [
+
           {
-            label: '系统号',
-            prop: 'sysNo',
-            disabled: true,
+            label: '合同类型',
+            prop: 'orderType',
+            // type:'select',
+            dicData: [],
             rules: [
               {
                 required: false,
@@ -556,6 +566,18 @@ export default {
             ]
           },
           {
+            label: '系统号',
+            prop: 'sysNo',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: "备注",
             span: 24,
             prop: "orderRemark",
@@ -634,6 +656,9 @@ export default {
     getlistByBillNo().then(res => {
       this.listByBillNo = res.data.data
     })
+    this.getWorkDicts("contractType").then(res => {
+      this.contractTypeDic = res.data.data
+    })
   },
   methods: {
     valueName(value, row) {

src/views/salesManagement/salesContract/index.vue

@@ -20,7 +20,7 @@
           <el-table-column label="提单号" prop="billNo" align="center" show-overflow-tooltip width="150"></el-table-column>
           <el-table-column label="合同号" prop="orgOrderNo" align="center" show-overflow-tooltip width="150">
           </el-table-column>
-          <el-table-column label="货物名称" prop="priceCategory" align="center" show-overflow-tooltip width="150">
+          <el-table-column label="货物名称" prop="priceCategoryNames" align="center" show-overflow-tooltip width="150">
           </el-table-column>
           <el-table-column label="件数" prop="orderQuantity" align="center" show-overflow-tooltip width="120">
           </el-table-column>
@@ -274,8 +274,8 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
-        //导出
-        outExport() {
+    //导出
+    outExport() {
       let params = { ...this.search }
       if (params.businesDate && params.businesDate.length > 0) {
         params = {
@@ -353,11 +353,11 @@ export default {
   padding: 0 !important;
 }
 
-/deep/ .el-table__expanded-cell .el-table__header-wrapper .cell {
+/* /deep/ .el-table__expanded-cell .el-table__header-wrapper .cell {
   font-size: 8px !important;
 }
 
 /deep/ .el-table__body-wrapper .cell {
   font-size: 8px;
-}
+} */
 </style>