修改bug

src/views/beEntrusted/index.vue

@@ -407,7 +407,7 @@
             label: '审批状态',
             align: 'center',
             slot: 'approvalStatus',
-            width: 100
+            width: 120
           },
 
           {

src/views/entrust/components/create.vue

@@ -248,7 +248,9 @@
     <template v-slot:footer v-if="type != 'detail'">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="save(1)"> 保存 </el-button>
-      <el-button type="primary" @click="save(2)" v-if="type != 'edit'"> 提交 </el-button>
+      <el-button type="primary" @click="save(2)" v-if="type != 'edit'">
+        提交
+      </el-button>
     </template>
     <!-- <detail
       v-if="activeComp === 'bpm' && form.processInstanceId"
@@ -829,7 +831,11 @@
             item.name = this.form.name;
             item.type = this.form.type;
             item.status = type == 1 ? 0 : 1;
-            item.approvalStatus = type == 1 ? 0 : 1;
+            item.approvalStatus = item.approvalStatus
+              ? item.approvalStatus
+              : type == 1
+              ? 0
+              : 1;
           });
           let URL;
 

src/views/entrust/components/produceOrder.vue

@@ -6,7 +6,7 @@
     :close-on-click-modal="true"
     :close-on-press-escape="false"
     append-to-body
-    width="70%"
+    width="80%"
     title="生产工单"
   >
     <div>
@@ -673,6 +673,11 @@
     },
     methods: {
       datasource({ page, where, limit }) {
+        if (Object.keys(where).length == 0) {
+          where.statusList = (
+            where.status || this.statusOpt[this.activeName][0].value
+          ).split(',');
+        }
         return produceOrder({
           ...where,
           pageNum: page,

src/views/entrust/index.vue

@@ -99,9 +99,10 @@
           <el-link
             type="primary"
             v-if="
-              row.status == 0 &&
-              row.approvalStatus != 1 &&
-              row.approvalStatus != 2
+              (row.status == 0 &&
+                row.approvalStatus != 1 &&
+                row.approvalStatus != 2) ||
+              row.approvalStatus == 3
             "
             :underline="false"
             @click="open('edit', row)"
@@ -111,9 +112,10 @@
           <el-popconfirm
             class="ele-action"
             v-if="
-              row.status == 0 &&
-              row.approvalStatus != 1 &&
-              row.approvalStatus != 2
+              (row.status == 0 &&
+                row.approvalStatus != 1 &&
+                row.approvalStatus != 2) ||
+              row.approvalStatus == 3
             "
             title="确定要删除吗？"
             @confirm="remove([row.id])"
@@ -127,11 +129,7 @@
             type="primary"
             :underline="false"
             @click="submit(row)"
-            v-if="
-              row.status == 0 &&
-              row.approvalStatus != 1 &&
-              row.approvalStatus != 2
-            "
+            v-if="row.approvalStatus != 1 && row.approvalStatus != 2"
           >
             提交
           </el-link>
@@ -184,7 +182,7 @@
             type="primary"
             :underline="false"
             @click="handleFlow(row)"
-            v-if="row.approvalStatus == 1 || row.approvalStatus == 2"
+            v-if="row.approvalStatus != 0"
           >
             流程
           </el-link>
@@ -500,7 +498,7 @@
             label: '审批状态',
             align: 'center',
             slot: 'approvalStatus',
-            width: 100
+            width: 120
           },
 
           {

src/views/produce/components/new_produceOrder.vue

@@ -541,7 +541,7 @@
   }
 
   ::v-deep .el-table .ent-row {
-    background: #d1b609;
+    background: #b3e10b;
     // color: #39d9ac;
   }
 

src/views/warehousing/index.vue

@@ -49,6 +49,15 @@
           >
             入库
           </el-link>
+
+          <el-link
+            type="primary"
+            :underline="false"
+            @click="handleFlow(row)"
+            v-if="row.approvalStatus != 0"
+          >
+            流程
+          </el-link>
           <!-- <el-link type="primary" :underline="false" @click="details(row)">
             详情
           </el-link> -->
@@ -57,6 +66,7 @@
     </el-card>
 
     <tgDetails ref="tgDetailsRefs"></tgDetails>
+    <flow ref="flowRef"></flow>
     <storage inboundType="2" ref="storageRefs" @success="reload"></storage>
   </div>
 </template>
@@ -67,11 +77,13 @@
   import search from './components/search.vue';
   import tgDetails from './components/tgDetails.vue';
   import storage from './storageComponents/storage.vue';
+  import flow from '@/views/materialReturn/components/flow.vue';
   export default {
     components: {
       search,
       tgDetails,
-      storage
+      storage,
+      flow
     },
     data() {
       return {
@@ -287,6 +299,13 @@
         this.$refs.storageRefs.pickerSuccess(row);
       },
 
+      handleFlow(row) {
+        if (!row.processInstanceId) {
+          return this.$message.warning('暂无流程图');
+        }
+        this.$refs.flowRef.open(row.processInstanceId);
+      },
+
       /* 刷新表格 */
       reload(where) {
         this.$nextTick(() => {