From a48ded866d223f581944ea9043df1b296b3425e3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 十二月 2023 13:17:46 +0800
Subject: [PATCH] 	modified:   src/views/basic/company/index.vue 	modified:   src/views/basic/customizeparamtemplatetype/index.vue 	modified:   src/views/basic/division/index.vue 	modified:   src/views/basic/factory/index.vue 	modified:   src/views/basic/location/index.vue 	modified:   src/views/basic/param/index.vue 	modified:   src/views/basic/part/index.vue 	modified:   src/views/basic/post/index.vue 	modified:   src/views/basic/shift/index.vue 	modified:   src/views/basic/staff/index.vue 	modified:   src/views/basic/template/index.vue 	modified:   src/views/basic/warehouse/index.vue 	modified:   src/views/basic/workstation/index.vue 	modified:   src/views/plan/manufacturingorder/index.vue 	modified:   src/views/plan/masterproductionschedule/index.vue 	modified:   src/views/plan/operationtask/index.vue 	modified:   src/views/plan/productionschedul/index.vue 	modified:   src/views/quality/finishedProductInspection/index.vue 	modified:   src/views/quality/rawMaterial/index.vue 	modified:   src/views/technology/completeproductstructure/index.vue 	modified:   src/views/technology/document/index.vue 	modified:   src/views/technology/operation/index.vue 	modified:   src/views/technology/routing/index.vue 	modified:   src/views/technology/structure/index.vue 	modified:   src/views/warehouse/FinishedWarehousing/index.vue 	modified:   src/views/warehouse/changestock/index.vue 	modified:   src/views/warehouse/pallettransports/index.vue

---
 src/views/plan/customerorder/index.vue |   52 +++++-----------------------------------------------
 1 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 8ac6bbd..061bfc5 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -12,22 +12,6 @@
         ref="customerOrderTable"
       >
         <template #toolbar>
-          <!-- <el-dropdown
-            v-if="permissions.customerorder_state_change"
-            @command="handleCommand"
-          >
-            <el-button>
-              鐘舵�佹敼鍙�<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item
-                :command="item.command"
-                v-for="item in stateTagArr"
-                :disabled="item.disabled">
-                {{ item.label }}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
           <el-dropdown
             v-if="permissions.customerorder_doc_relate"
             @command="documentHandle"
@@ -65,35 +49,14 @@
               >
             </el-dropdown-menu>
           </el-dropdown>
-          <!-- <el-button
-            v-if="permissions.customerorder_push_otc"
-            style="margin-left:10px;"
-            type="primary"
-            @click="pushOtc"
-            >鎺ㄩ�丒RP</el-button
-          > -->
-          <!-- <el-button
-            style="margin-left:10px;"
-            type="primary"
-            @click="importOutPutBatch"
-            >瀵煎叆浜у嚭鎵规</el-button
-          > -->
           <el-button
             style="margin-left:10px;"
             type="primary"
             @click="()=>exportDialogVisible=true"
             >瀵煎嚭鍙拌处</el-button
           >
-          <!-- <el-button
-            v-if="permissions.plan_customerorder_return"
-            style="margin-left:10px;"
-            type="primary"
-            @click="returnOrder"
-            >璁㈠崟閫�鍥�</el-button
-          > -->
         </template>
       </ttable>
-
       <!-- 寮圭獥, 鏃ユ湡閫夋嫨 -->
       <ConfirmPullCustomerorder
         v-if="showPullCustomerOrderVisible"
@@ -449,7 +412,7 @@
           {
             minWidth: '100',
             width: '100px',
-            prop: 'customerOrderNo',
+            prop: 'contractNo',
             label: '鍚堝悓缂栧彿',
             sort: true,
             isTrue: true,
@@ -475,7 +438,7 @@
             searchInfoType: 'text'
           },
           {
-            minWidth: '120',
+            minWidth: '100',
             prop: 'sourceId',
             label: '娣诲姞鏉ユ簮',
             isTag: true,
@@ -691,7 +654,7 @@
           //   fun: this.packageExportHandle
           // },
           {
-            text: '浣滃簾',
+            text: '鍒犻櫎',
             type: 'text',
             size: 'small',
             fun: this.cancelHandle,
@@ -770,10 +733,10 @@
       ],
       sourceIdList: [{
         label: '鍚屾',
-        value: '0'
+        value: "0"
       },{
         label: '鎵嬪姩',
-        value: '1'
+        value: "1"
       }],
       stockVisible: false,
       partName: null,
@@ -976,8 +939,6 @@
     },
     // 鍒涘缓涓荤敓浜ц鍒�
     masterPlanHandle() {
-      console.log(this.multipleSelection);
-
       if (this.multipleSelection && this.multipleSelection.length > 0) {
         if (this.judgeCoState(this.multipleSelection)) {
           // 鍒ゆ柇涓�涓嬪墿浣欐暟閲忔槸鍚﹀ぇ浜�0
@@ -1102,7 +1063,6 @@
           })
           if (flag) {
             checkOA(this.multipleSelection.map((e) => e.id)).then((res) => {
-              console.log(res)
               if (!res.data.data.success) {
                 this.$confirm(`${res.data.data.message}`, '鎻愮ず', {
                   confirmButtonText: '纭畾',
@@ -1151,7 +1111,6 @@
 
     // 绠辩爜淇℃伅瀵煎嚭
     packageExportHandle(row) {
-      console.log(row.otcQuantity)
       if (row.otcQuantity) {
         this.packageExport.visible = true
         this.packageExport.form = {
@@ -1580,7 +1539,6 @@
     },
     // 瀵煎嚭鍙拌处
     exportStandBook() {
-      // console.log(this.$refs.customerOrderTable.getQueryParam(),"SSS")
       // if (this.multipleSelection.length > 0) {
       //   let ids = ''
       //   this.multipleSelection.forEach((item) => {

--
Gitblit v1.9.3