同步

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -231,8 +231,8 @@ export default {
             label: "待出库",
             value: 5
           }, {
-            label: "出库中",
-            value: 6
+            label: "已出库",
+            value: 7
           }],
           search: true
         }, {

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -567,11 +567,11 @@ export default {
           prop: 'seaFreight',
           index:5,
         }, {
-          label: '起运港箱使费',
+          label: '起运港箱使天数',
           prop: 'departureHarborFee',
           index:6,
         }, {
-          label: '目的港箱使费',
+          label: '目的港箱使天数',
           prop: 'objectiveHarborFee',
           index:7,
         }, {

src/views/landTransportation/reportAnalysis/index.vue

@@ -95,6 +95,7 @@
             ref="collection"
             @resetColumn="resetColumnCollection"
             @saveColumn="saveColumnCollection"
+            @search-change="search-change"
             @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
             @row-update="rowSave">
           <template slot-scope="{row,index}" slot="menu">
@@ -259,7 +260,6 @@ export default {
           }, {
             label: '车号',
             width: 90,
-            search: true,
             prop: 'plateNo'
           }, {
             label: '备注',

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -69,6 +69,7 @@
                     style="width: 100%;"
                     size="small"
                     placeholder="请选择"
+                    :disabled="item.disabled ? item.disabled : false"
                   >
                     <el-option
                       v-for="(item, index) in item.dicData"
@@ -311,8 +312,7 @@
             type="primary"
             @click="importGoods"
             :disabled="selectionList.length == 0"
-            >导入</el-button
-          >
+            >导入</el-button>
         </span>
       </el-dialog>
     </div>
@@ -549,6 +549,7 @@ export default {
           children: "children"
         }
       },
+      roleName: localStorage.getItem("roleName").split(','),
       goodsOption: goodsOption,
       loading: false,
       goodsList: [],
@@ -607,6 +608,12 @@ export default {
             this.oldBuyFree = this.deepClone(this.contactsDataBuyFree);
             delete this.form.specialItemList;
             delete this.form.presentItemList;
+            if (this.form.auditStatus === 0){
+              this.findObject(this.basicData.column, "status").disabled = true
+              if (this.roleName.indexOf('admin') !== -1){
+                this.findObject(this.basicData.column, "status").disabled = false
+              }
+            }
             this.getItemdetail();
             this.openFullScreen(true);
           })

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -670,17 +670,11 @@ export default {
       }).then(() => {
         if (row.id) {
           delItem({itemId: row.id,type:"RK"}).then(res => {
-            this.$message({
-              type: "success",
-              message: "删除成功!"
-            });
+            this.$message.success("删除成功!");
             this.itemsVOList.splice(row.$index, 1);
           });
         } else {
-          this.$message({
-            type: "success",
-            message: "删除成功!"
-          });
+          this.$message.success("删除成功!");
           this.itemsVOList.splice(row.$index, 1);
         }
       });

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -563,8 +563,7 @@ export default {
       for (let item of this.option.column) {
         if (item.prop === 'extraAmountC') return this.reset()
       }
-      this.option.column.push(
-          {
+      this.option.column.push({
             label: '客户名称',
             prop: 'corpShortName',
             index: 2,
@@ -573,22 +572,17 @@ export default {
           },{
             label: '业务员',
             prop: 'salesmanName',
-            index: 3,
+            index: 2,
             width: 60,
             overHidden: true,
           }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
-            index: 4,
-            width: 100,
-          },{
-            label: '应付运费',
-            prop: 'landAmountC',
-            index: 14,
+            index: 2,
             width: 100,
-            overHidden: true
-          }, {
+          },
+          {
             label: '应付杂费',
             prop: 'extraAmountC',
             index: 14,
@@ -707,8 +701,8 @@ export default {
           this.findObject(this.optionTwo.column, "extraAmountD").hide = true
           this.findObject(this.optionTwo.column, "extraAmountD").showColumn = false
         }
-        this.key++
       }
+      this.key++
     },
     //自定义列保存
     async saveColumn() {