xiaodai2022 2 năm trước cách đây
mục cha
commit
c83dbad21e
2 tập tin đã thay đổi với 100 bổ sung94 xóa
  1. 9 7
      src/views/stock/allot/components/addForm.vue
  2. 91 87
      src/views/stock/allot/detail.vue

+ 9 - 7
src/views/stock/allot/components/addForm.vue

@@ -119,16 +119,18 @@
         </el-row>
       </el-form>
     </el-col>
-    <el-col :span="24">
+    <el-col
+      :span="24"
+      v-if="
+        !(
+          (status == '3' && powers.some((item) => item == '022')) ||
+          (status == '4' && powers.some((item) => item == '023'))
+        )
+      "
+    >
       <el-form
         :model="tableForm"
         :rules="tableFormThis"
-        v-if="
-          !(
-            (status == '3' && powers.some((item) => item == '022')) ||
-            (status == '4' && powers.some((item) => item == '023'))
-          )
-        "
         ref="tableForm"
         :size="'mini'"
         class="demo-tableForm product_go"

+ 91 - 87
src/views/stock/allot/detail.vue

@@ -29,94 +29,97 @@
       /> -->
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
-      <el-collapse v-model="activeNames" style="margin:-18px 0 0 0">
-        <el-collapse-item title="调拨详情" name="-1">
-          <add-form
-            :newTime="newTime"
-            v-if="newTime !== ''"
-            :sitem="sitem"
-            :id="queryId"
-            @refresh="initData()"
-          />
-        </el-collapse-item>
-        <el-collapse-item
-          title="发起审核流程"
-          name="0"
-          v-if="
-            (status === '0' && powers.some((item) => item == '012')) ||
-            (status === '1' && powers.some((item) => item == '014'))
-          "
-        >
-          <div class="exam-content">
-            <el-button
-              type="primary"
-              class="fr"
-              :size="'mini'"
-              @click="statusConfirm('1', '发起审核流程')"
-              v-if="status === '0' && powers.some((item) => item == '012')"
-              >发起审核流程
-            </el-button>
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="调拨详情" name="-1">
+              <add-form
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :sitem="sitem"
+                :id="queryId"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
+            <el-collapse-item
+              title="发起审核流程"
+              name="0"
+              v-if="
+                (status === '0' && powers.some((item) => item == '012')) ||
+                (status === '1' && powers.some((item) => item == '014'))
+              "
+            >
+              <div class="exam-content">
+                <el-button
+                  type="primary"
+                  class="fr"
+                  :size="'mini'"
+                  @click="statusConfirm('1', '发起审核流程')"
+                  v-if="status === '0' && powers.some((item) => item == '012')"
+                  >发起审核流程
+                </el-button>
 
-            <el-button
-              @click="statusConfirm('0', '取消审核流程')"
-              plain
-              class="fr"
-              :size="'mini'"
-              v-if="status === '1' && powers.some((item) => item == '014')"
-              >取消审核流程</el-button
+                <el-button
+                  @click="statusConfirm('0', '取消审核流程')"
+                  plain
+                  class="fr"
+                  :size="'mini'"
+                  v-if="status === '1' && powers.some((item) => item == '014')"
+                  >取消审核流程</el-button
+                >
+              </div>
+            </el-collapse-item>
+            <el-collapse-item
+              title="入库方审核"
+              name="1"
+              v-if="status == '1' && powers.some((item) => item == '020')"
             >
-          </div>
-        </el-collapse-item>
-        <el-collapse-item
-          title="入库方审核"
-          name="1"
-          v-if="status == '1' && powers.some((item) => item == '020')"
-        >
-          <exam-form
-            :statusList="statusList"
-            :newTime="newTime"
-            v-if="newTime !== ''"
-            :disabled="false"
-            :isMust="false"
-            @searchChange="examForm"
-          />
-        </el-collapse-item>
-        <el-collapse-item
-          title="出库方发货"
-          name="2"
-          v-if="status !== '' && status !== '0' && status !== '1'"
-        >
-          <go-stock-audit
-          
-            :newTime="newTime"
-            :sitem="sitem"
-            v-if="newTime !== ''"
-            :id="queryId"
-            @refresh="initData()"
-          />
-        </el-collapse-item>
-        <el-collapse-item title="入库方验货" name="3" v-if="status == '3'">
-          <inspection-table
-            :newTime="newTime"
-            :sitem="sitem"
-            v-if="newTime !== ''"
-            :id="queryId"
-            @refresh="initData()"
-          />
-        </el-collapse-item>
-        <el-collapse-item title="入库方验货审核" name="4" v-if="status == '4'">
-          <inspection-table
-            :newTime="newTime"
-            :sitem="sitem"
-            v-if="newTime !== ''"
-            :id="queryId"
-            @refresh="initData()"
-          />
-        </el-collapse-item>
-      </el-collapse>
-         </el-tab-pane>
+              <exam-form
+                :statusList="statusList"
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :disabled="false"
+                :isMust="false"
+                @searchChange="examForm"
+              />
+            </el-collapse-item>
+            <el-collapse-item
+              title="出库方发货"
+              name="2"
+              v-if="status !== '' && status !== '0' && status !== '1'"
+            >
+              <go-stock-audit
+                :newTime="newTime"
+                :sitem="sitem"
+                v-if="newTime !== ''"
+                :id="queryId"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
+            <el-collapse-item title="入库方验货" name="3" v-if="status == '3'">
+              <inspection-table
+                :newTime="newTime"
+                :sitem="sitem"
+                v-if="newTime !== ''"
+                :id="queryId"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
+            <el-collapse-item
+              title="入库方验货审核"
+              name="4"
+              v-if="status == '4'"
+            >
+              <inspection-table
+                :newTime="newTime"
+                :sitem="sitem"
+                v-if="newTime !== ''"
+                :id="queryId"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
         <el-tab-pane label="审批记录" name="2">
-            <process-time-line
+          <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'DBD'"
@@ -161,9 +164,9 @@ export default {
   },
   data() {
     return {
-       activeTabs: "1",
+      activeTabs: "1",
       code: "",
-      activeNames: ["-1", "0", "1", "2", "3", "4", "5" ],
+      activeNames: ["-1", "0", "1", "2", "3", "4", "5"],
       sitem: null,
       status: "",
       newTime: "",
@@ -253,6 +256,7 @@ export default {
       }
     },
     async initData() {
+      this.newTime = "";
       this.loading = true;
       const res = await asyncRequest.detail({ id: this.queryId });
       if (res && res.code === 0 && res.data) {