调试

zkqy-ui/src/views/orderMange/requisitionOrders/approval.vue

@@ -28,7 +28,7 @@
       <el-form-item label="审批状态" prop="state">
         <el-select v-model="queryParams.dataApprovalStatus" filterable placeholder="请选择任务领料"
                    @change="handleQuery">
-          <el-option key="1" label="未审批" value="0"/>
+          <el-option key="1" label="未审批" value="5"/>
           <el-option key="3" label="已审批" value="7"/>
           <!-- 0=:待提交、1:审核中、2:已批准、3:未批准、4:已作废、5:已完成 -->
         </el-select>
@@ -71,7 +71,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="queryParams.dataApprovalStatus=='5'">
         <template slot-scope="scope">
 
           <el-dropdown>
@@ -228,7 +228,7 @@ export default {
         state: null,
         createById: null,
         updateById: null,
-        dataApprovalStatus: '0',
+        dataApprovalStatus: '5',
         requistionOrdersType: 0,
         processKey: null,
         taskProcessKey: null,
@@ -423,9 +423,11 @@ export default {
         this.open = false;
         this.getList();
         this.$modal.msgSuccess("审批成功");
-      }).catch(() => {
-        this.$modal.msgError("错误！请联系管理员！");
-      });
+      })
+      // .catch(() => {
+      //   this.$modal.msgError("错误！请联系管理员！");
+      // })
+      ;
     },
     /** 领料明细序号 */
     rowRequisitionItemsIndex({row, rowIndex}) {

zkqy-ui/src/views/orderMange/requisitionOrders/index.vue

@@ -219,7 +219,7 @@
           <el-table-column label="物料" prop="materialId" align="center">
             <template slot-scope="scope">
               <el-select v-model="scope.row.materialId" filterable placeholder="请选择物料"
-                         :disabled="requistionState"
+                        :disabled="requistionState?true:requistionOrdersType?true:false"
                          @change="handleMaterielInfo(scope)">
                 <el-option v-for="mtem in materielList" :key="mtem.id" :label="mtem.materielCode+''+mtem.materielName"
                            :value="mtem.materielCode"></el-option>
@@ -230,12 +230,12 @@
                            align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.quantity" type="number" placeholder="请输入预计领用数量/重量"
-                        :disabled="requistionState"/>
+                        :disabled="requistionState?true:requistionOrdersType?true:false"/>
             </template>
           </el-table-column>
           <el-table-column label="备注" prop="remark" width="250" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark" placeholder="请输入备注" :disabled="requistionState"/>
+              <el-input v-model="scope.row.remark" placeholder="请输入备注" :disabled="requistionState?true:requistionOrdersType?true:false"/>
             </template>
           </el-table-column>
         </el-table>
@@ -494,7 +494,6 @@ export default {
         return this.$message.error("请完善表单数据");
       }
 
-      return;
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.form.requisitionItemsList = this.requisitionItemsList;
@@ -551,7 +550,8 @@ export default {
         let form = {
           ...row,
           state: 1,              // 0=:待提交、1:审核中、2:已批准、3:未批准、4:已作废、5:已完成
-          dataApprovalStatus: 0, // 数据审批状态（0:未审批、1:审批中、2:审批通过、3:审批不通过）
+
+          dataApprovalStatus: 5, //审批状态参考字典
         }
         return approvalOrders(form);
       }).then(() => {

zkqy-ui/src/views/system/financialManage/invoiceDetail.vue

@@ -151,7 +151,7 @@
         <el-table-column label="开票"></el-table-column>
         <el-table-column label="差额"></el-table-column>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -161,7 +161,7 @@
             <el-button type="warning" plain size="small">
               操作<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
-            <el-dropdown-menu slot="dropdown">
+            <el-dropdown-menu slot="dropdown"> -->
               <!-- <el-dropdown-item
                 v-show="scope.row.status == 1 || scope.row.status == 3"
                 ><el-button
@@ -173,7 +173,7 @@
                   >修改</el-button
                 ></el-dropdown-item
               > -->
-              <el-dropdown-item
+              <!-- <el-dropdown-item
                 ><el-button
                   size="mini"
                   type="text"
@@ -181,7 +181,7 @@
                   @click="handleDetail(scope.row)"
                   >查看明细</el-button
                 ></el-dropdown-item
-              >
+              > -->
               <!-- <el-dropdown-item
                 v-show="scope.row.status == 1 || scope.row.status == 3"
                 ><el-button
@@ -204,10 +204,10 @@
                   >删除</el-button
                 ></el-dropdown-item
               > -->
-            </el-dropdown-menu>
+            <!-- </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -382,7 +382,11 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    
     <!-- 明细弹窗 -->
+    <el-dialog :title="title" :visible.sync="detailShow" width="600px" append-to-body>
+      <div>11111</div>
+    </el-dialog>
   </div>
 </template>
 
@@ -457,6 +461,7 @@ export default {
   methods: {
     // 查看明细回调
     handleDetail(row) {
+      console.log('-------------------------------');
       this.detailShow = true;
     },
     // 提交回调